Merge branch 'main' of https://github.com/hotwax/available-to-proimse …

…into #38
hotwax · Dec 16, 2024 · 8d293ad · 8d293ad
2 parents 403ed4d + 3569bb2
commit 8d293ad
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/data/AtpSeedData.xml b/data/AtpSeedData.xml
@@ -25,17 +25,17 @@
 
     <moqui.basic.StatusType statusTypeId="RG_STATUS" description="Rule Group Status" hasTable="N"/>
     <moqui.basic.StatusType statusTypeId="ATP_RG_STATUS" parentTypeId="RG_STATUS" description="ATP Rule Group Status" hasTable="N"/>
-    <moqui.basic.StatusItem statusId="ATP_RG_DRAFT" description="Draft" sequenceId="01" statusCode="DRAFT" statusTypeId="ATP_RG_STATUS"/>
-    <moqui.basic.StatusItem statusId="ATP_RG_ACTIVE" description="Active" sequenceId="02" statusCode="ACTIVE" statusTypeId="ATP_RG_STATUS"/>
-    <moqui.basic.StatusItem statusId="ATP_RG_ARCHIVED" description="Archived" sequenceId="02" statusCode="ARCHIVED" statusTypeId="ATP_RG_STATUS"/>
+    <moqui.basic.StatusItem statusId="ATP_RG_DRAFT" description="Draft" sequenceNum="1" statusCode="DRAFT" statusTypeId="ATP_RG_STATUS"/>
+    <moqui.basic.StatusItem statusId="ATP_RG_ACTIVE" description="Active" sequenceNum="2" statusCode="ACTIVE" statusTypeId="ATP_RG_STATUS"/>
+    <moqui.basic.StatusItem statusId="ATP_RG_ARCHIVED" description="Archived" sequenceNum="3" statusCode="ARCHIVED" statusTypeId="ATP_RG_STATUS"/>
     <moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="ATP_RG_DRAFT" toStatusId="ATP_RG_ACTIVE" transitionName="Active"/>
     <moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="ATP_RG_ACTIVE" toStatusId="ATP_RG_ARCHIVED" transitionName="Active to Archived"/>
     <moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="ATP_RG_DRAFT" toStatusId="ATP_RG_ARCHIVED" transitionName="Draft to Archived"/>
 
     <moqui.basic.StatusType statusTypeId="ATP_RULE_STATUS" parentTypeId="RG_STATUS" description="ATP Rule Status" hasTable="N"/>
-    <moqui.basic.StatusItem statusId="ATP_RULE_DRAFT" description="Draft" sequenceId="01" statusCode="DRAFT" statusTypeId="ATP_RULE_STATUS"/>
-    <moqui.basic.StatusItem statusId="ATP_RULE_ACTIVE" description="Active" sequenceId="02" statusCode="ACTIVE" statusTypeId="ATP_RULE_STATUS"/>
-    <moqui.basic.StatusItem statusId="ATP_RULE_ARCHIVED" description="Archived" sequenceId="02" statusCode="ARCHIVED" statusTypeId="ATP_RULE_STATUS"/>
+    <moqui.basic.StatusItem statusId="ATP_RULE_DRAFT" description="Draft" sequenceNum="1" statusCode="DRAFT" statusTypeId="ATP_RULE_STATUS"/>
+    <moqui.basic.StatusItem statusId="ATP_RULE_ACTIVE" description="Active" sequenceNum="2" statusCode="ACTIVE" statusTypeId="ATP_RULE_STATUS"/>
+    <moqui.basic.StatusItem statusId="ATP_RULE_ARCHIVED" description="Archived" sequenceNum="3" statusCode="ARCHIVED" statusTypeId="ATP_RULE_STATUS"/>
     <moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="ATP_RULE_DRAFT" toStatusId="ATP_RULE_ACTIVE" transitionName="Active"/>
     <moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="ATP_RULE_DRAFT" toStatusId="ATP_RULE_ARCHIVED" transitionName="Draft to Archived"/>
     <moqui.basic.StatusFlowTransition statusFlowId="Default" statusId="ATP_RULE_ACTIVE" toStatusId="ATP_RULE_ARCHIVED" transitionName="Active to Archived"/>

diff --git a/entity/DecisionRuleEntities.xml b/entity/DecisionRuleEntities.xml
@@ -41,10 +41,10 @@ under the License.
         <relationship type="one-nofk" related="moqui.service.job.ServiceJob" short-alias="schedule">
             <key-map field-name="jobName"/>
         </relationship>
-        <relationship type="one" fk-name="RG_STATUS" related="org.apache.ofbiz.common.status.StatusItem" short-alias="status">
+        <relationship type="one" fk-name="RG_STATUS" related="moqui.basic.StatusItem" short-alias="status">
             <key-map field-name="statusId"/>
         </relationship>
-        <relationship type="one" fk-name="RG_TYPE_ENUM" title="RuleGroupType" related="org.apache.ofbiz.common.enum.Enumeration" short-alias="ruleGroupType">
+        <relationship type="one" fk-name="RG_TYPE_ENUM" title="RuleGroupType" related="moqui.basic.Enumeration" short-alias="ruleGroupType">
             <key-map field-name="groupTypeEnumId" related="enumId"/>
         </relationship>
         <relationship type="many" related="co.hotwax.rule.DecisionRule" short-alias="decisionRules">
@@ -71,7 +71,7 @@ under the License.
         <field name="sequenceNum" type="number-integer" enable-audit-log="true"><description>Sequence number for ordering.</description></field>
         <field name="createdDate" type="date-time"><description>Date and time when the rule was created.</description></field>
         <field name="createdByUser" type="id-long"><description>User login ID of the creator.</description></field>
-        <relationship type="one" fk-name="RULE_STATUS" related="org.apache.ofbiz.common.status.StatusItem" short-alias="status">
+        <relationship type="one" fk-name="RULE_STATUS" related="moqui.basic.StatusItem" short-alias="status">
             <key-map field-name="statusId"/>
         </relationship>
         <relationship type="one" fk-name="RULE_GROUP" related="co.hotwax.rule.RuleGroup" short-alias="ruleGroup">
@@ -98,7 +98,7 @@ under the License.
         <field name="fieldValue" type="text-long" enable-audit-log="true"><description>Value of the condition.</description></field>
         <field name="sequenceNum" type="number-integer" enable-audit-log="true"><description>Sequence number for ordering.</description></field>
         <field name="createdDate" type="date-time"><description>Date and time when the condition was created.</description></field>
-        <relationship type="one" fk-name="RULE_COND_TYPEENUM" title="RuleConditionType" related="org.apache.ofbiz.common.enum.Enumeration" short-alias="ruleConditionType">
+        <relationship type="one" fk-name="RULE_COND_TYPEENUM" title="RuleConditionType" related="moqui.basic.Enumeration" short-alias="ruleConditionType">
             <key-map field-name="conditionTypeEnumId" related="enumId"/>
         </relationship>
         <relationship type="one" fk-name="RULE_COND_RULE" related="co.hotwax.rule.DecisionRule" short-alias="decisionRule">
@@ -120,7 +120,7 @@ under the License.
         <relationship type="one" fk-name="RULE_ACTION_RULE" related="co.hotwax.rule.DecisionRule" short-alias="decisionRule">
             <key-map field-name="ruleId"/>
         </relationship>
-        <relationship type="one" fk-name="RULE_ACTION_TYPEENUM" title="RuleActionType" related="org.apache.ofbiz.common.enum.Enumeration" short-alias="ruleActionType">
+        <relationship type="one" fk-name="RULE_ACTION_TYPEENUM" title="RuleActionType" related="moqui.basic.Enumeration" short-alias="ruleActionType">
             <key-map field-name="actionTypeEnumId" related="enumId"/>
         </relationship>
         <master>