Skip to content
Snippets Groups Projects
Commit 0ab8634f authored by Recolic K's avatar Recolic K
Browse files

adjust manualop code

parent 39797831
No related branches found
No related tags found
No related merge requests found
Pipeline #849 passed with stage
in 10 seconds
......@@ -33,7 +33,7 @@ namespace CIS {
class Activity : public ActivityBase {
public:
// All `Name` should not contain QuotationMark(")
Activity(string displayName, string className, string entityName = "")
explicit Activity(string displayName, string className, string entityName = "")
: displayName(Utility::HtmlEscapeString(displayName)), className(className), entityName(entityName), taskId(Utility::GenUUID()) {}
Activity(const Activity &another)
: displayName(another.displayName), className(another.className), entityName(another.entityName), taskId(Utility::GenUUID()), inputSettings(another.inputSettings) {}
......@@ -88,8 +88,11 @@ namespace CIS {
class ManualOperation : public ActivityBase {
public:
explicit ManualOperation(string displayName, string message = "", string entityName = "")
: displayName(Utility::HtmlEscapeString(displayName)), messageInCSharp(Utility::HtmlEscapeString("\"" + message + "\"")), entityName(entityName) {}
: displayName(Utility::HtmlEscapeString(displayName)), messageInCSharp(Utility::HtmlEscapeString("\"" + message + "\"")), entityName(entityName), taskId(Utility::GenUUID()) {}
ManualOperation(const ManualOperation &another)
: displayName(another.displayName), messageInCSharp(another.messageInCSharp), entityName(another.entityName), taskId(Utility::GenUUID()) {}
ManualOperation(ManualOperation &&) = default;
ManualOperation &explicitSetMessageInCSharp(string messageInCSharp) {
this->messageInCSharp = messageInCSharp;
return *this;
......@@ -97,9 +100,11 @@ namespace CIS {
private:
string displayName, messageInCSharp, entityName;
string taskId;
virtual rlib::string generateXaml() const override {
rlib::string xamlCode = templates::MANUAL_OPERATION_XAML;
xamlCode.replace_once("__TEMPLATE_ARG_DisplayName", displayName);
xamlCode.replace_once("__TEMPLATE_ARG_TaskId", this->taskId);
xamlCode.replace_once("__TEMPLATE_ARG_CodeLines", messageInCSharp);
auto entityXaml = this->entityName == "" ? "" : rlib::string(templates::ENTITY_DEF_TEMPLATE).replace("__TEMPLATE_ARG_EntityName", this->entityName);
......
......@@ -96,7 +96,7 @@ constexpr auto STD_XAML_TAIL = "</Activity>";
constexpr auto MANUAL_OPERATION_XAML =
R"XAML( <mwcwa:ManualOperation DeprecatedTaskId="{x:Null}" TaskId="{x:Null}" DisplayName="__TEMPLATE_ARG_DisplayName" MonitoringSystems="icm" WaitUntilFinish="True" __TEMPLATE_ARG_EntityDefPlaceholder>
R"XAML( <mwcwa:ManualOperation DeprecatedTaskId="{x:Null}" TaskId="__TEMPLATE_ARG_TaskId" DisplayName="__TEMPLATE_ARG_DisplayName" MonitoringSystems="icm" WaitUntilFinish="True" __TEMPLATE_ARG_EntityDefPlaceholder>
<mwcwa:ManualOperation.AdditionalContent>
<InArgument x:TypeArguments="x:String">
<mca:CSharpValue x:TypeArguments="x:String">__TEMPLATE_ARG_CodeLines</mca:CSharpValue>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment