Merge branch 'Vertragsmanagement'

# Conflicts:
#	entity/Pers_entity/Pers_entity.aod
#	process/Keyword_lib/process.js

entity/Contract_entity/entityfields/user_edit/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file

entity/Contract_entity/entityfields/user_new/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file

entity/History_entity/History_entity.aod

@@ -114,6 +114,18 @@
       <contentType>IMAGE</contentType>
       <valueProcess>%aditoprj%/entity/History_entity/entityfields/direction_icon/valueProcess.js</valueProcess>
     </entityField>
+    <entityIncomingField>
+      <name>ContractHistory_dfi</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <dependencies>
+        <entityDependency>
+          <name>f47157d9-0cb6-4bcf-a485-08675bd957ee</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>ContractHistory_dfo</fieldName>
+          <isOutgoing v="false" />
+        </entityDependency>
+      </dependencies>
+    </entityIncomingField>
   </entityFields>
   <linkInformation>
     <linkInformation>

entity/Org_entity/Org_entity.aod

@@ -190,6 +190,12 @@
           <fieldName>PersOrg_dfo</fieldName>
           <isOutgoing v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>5132d22f-8e82-4ab6-bc3b-5cddcbf09661</name>
+          <entityName>Contract_entity</entityName>
+          <fieldName>ContractOrg_dfo</fieldName>
+          <isOutgoing v="false" />
+        </entityDependency>
       </dependencies>
     </entityIncomingField>
     <entityOutgoingField>
@@ -238,6 +244,22 @@
         </entityParameter>
       </children>
     </entityOutgoingField>
+    <entityOutgoingField>
+      <name>OrgContract_dfo</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Contract_entity</entityName>
+        <fieldName>OrgContract_dfi</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RelId_param</name>
+          <code>%aditoprj%/entity/Org_entity/entityfields/orgcontract_dfo/children/relid_param/code.js</code>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityOutgoingField>
   </entityFields>
   <linkInformation>
     <linkInformation>

entity/Org_entity/entityfields/orgcontract_dfo/children/relid_param/code.js

+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file

entity/Pers_entity/Pers_entity.aod

@@ -343,6 +343,22 @@
         </entityParameter>
       </children>
     </entityOutgoingField>
+    <entityOutgoingField>
+      <name>PersContract_dfo</name>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>Contract_entity</entityName>
+        <fieldName>PersContract_dfi</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>RelId_param</name>
+          <code>%aditoprj%/entity/Pers_entity/entityfields/perscontract_dfo/children/relid_param/code.js</code>
+          <triggerRecalculation v="true" />
+        </entityParameter>
+      </children>
+    </entityOutgoingField>
   </entityFields>
   <linkInformation>
     <linkInformation>

entity/Pers_entity/entityfields/perscontract_dfo/children/relid_param/code.js

+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.RELATIONID"));
\ No newline at end of file

neonContext/Contract_context/Contract_context.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.0.0">
+  <name>Contract_context</name>
+  <title>Contract</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <mainview>ContractMain_view</mainview>
+  <filterview>ContractFilter_view</filterview>
+  <editview>ContractEdit_view</editview>
+  <preview>ContractPreview_view</preview>
+  <entity>Contract_entity</entity>
+  <references>
+    <neonViewReference>
+      <name>b3049f73-3918-407f-905f-61307497a3d8</name>
+      <view>ContractFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>dbca973c-b41f-4a85-961c-025ebe073e62</name>
+      <view>ContractPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>ff6d8aec-1ad3-4cfe-a7a8-3346f4fa8ff0</name>
+      <view>ContractMain_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>e096f918-5312-46eb-8289-d9eddbeaa1f6</name>
+      <view>ContractEdit_view</view>
+    </neonViewReference>
+  </references>
+</neonContext>

neonView/ContractEdit_view/ContractEdit_view.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+  <name>ContractEdit_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <genericViewTemplate>
+      <name>Generic</name>
+      <editMode v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>5f2ef7a7-d7b5-49a8-86f3-3644036232fb</name>
+          <entityField>CONTRACTCODE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>3177f8e9-24e9-441f-8c19-b004935a86a9</name>
+          <entityField>RELATION_ID</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>b4a51794-f04c-4cc5-b0bd-ff89d8f5ada9</name>
+          <entityField>CONTRACTSTART</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>2fb49607-d34c-4a19-8c4e-2ec3db395fa9</name>
+          <entityField>CONTRACTEND</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>e66d7b82-5b48-46f3-b780-06a5f107faca</name>
+          <entityField>CONTRACTDUE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>f741bfda-5434-42ab-a5e9-ea1f7e4aaf79</name>
+          <entityField>CONTRACTSTATUS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>ac160ded-1a06-4664-b8bd-333e01468f61</name>
+          <entityField>CONTRACTTYPE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>02d4e542-f7ed-4900-82b3-b096958e1473</name>
+          <entityField>PAYMENT</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>4390abcd-d47e-40b2-85a9-655d39b17e82</name>
+          <entityField>REMARK</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>

neonView/ContractFilter_view/ContractFilter_view.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+  <name>ContractFilter_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <tableViewTemplate>
+      <name>Table_template</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTableColumn>
+          <name>1a610a45-8c8c-48d4-bc0b-905655afa016</name>
+          <entityField>CONTRACTCODE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ea38d067-af86-4936-8311-f64305fc5576</name>
+          <entityField>CONTRACTTYPE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>0ec4c5ee-4af2-4530-8fc3-fbecef7983b7</name>
+          <entityField>RELATION_ID</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>05f745fe-6f29-4536-9794-8ddfefd2b369</name>
+          <entityField>CONTRACTSTATUS</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ef313bd9-b3a3-4c60-b7d5-9cf2e208aade</name>
+          <entityField>CONTRACTSTART</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>845c3a71-0fa9-4299-9b85-8fa25f92436d</name>
+          <entityField>CONTRACTEND</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>ae80fe48-c0c7-4b53-b014-a25417c6fb35</name>
+          <entityField>CONTRACTDUE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>b72f0fa5-43ba-4852-9dfa-db592193e5a6</name>
+          <entityField>PAYMENT</entityField>
+        </neonTableColumn>
+      </columns>
+    </tableViewTemplate>
+  </children>
+</neonView>

neonView/ContractMain_view/ContractMain_view.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+  <name>ContractMain_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <masterSlaveLayout>
+      <name>layout</name>
+      <master>50a9de9b-1b4d-4dbd-a2f0-51b376df5b55</master>
+    </masterSlaveLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>50a9de9b-1b4d-4dbd-a2f0-51b376df5b55</name>
+      <entityField>#ENTITY</entityField>
+      <view>ContractPreview_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>8c6be607-ccce-4ad7-8dba-875b24d821e7</name>
+      <entityField>ContractHistory_dfo</entityField>
+      <view>HistoryFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>

neonView/ContractPreview_view/ContractPreview_view.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+  <name>ContractPreview_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <cardViewTemplate>
+      <name>ContractHeader_template</name>
+      <iconField>IMAGE</iconField>
+      <titleField>CONTRACTCODE_DISPLAY_fieldGroup</titleField>
+      <descriptionField>RELATION_ID</descriptionField>
+      <entityField>#ENTITY</entityField>
+    </cardViewTemplate>
+    <genericViewTemplate>
+      <name>ContractInfo_template</name>
+      <showDrawer v="true" />
+      <entityField>#ENTITY</entityField>
+      <fields>
+        <entityFieldLink>
+          <name>9101eee8-57b1-4bcf-a271-2501b7a3b842</name>
+          <entityField>CONTRACTSTART</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>9cc46e86-0f4b-406a-a702-77e840fc3988</name>
+          <entityField>CONTRACTEND</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>6529a64b-4249-434a-8692-45daad5264e3</name>
+          <entityField>CONTRACTDUE</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>b0ced77c-bd97-4318-8c0b-ad028111f039</name>
+          <entityField>CONTRACTSTATUS</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>aa310f7a-d66b-4128-8af0-3619099605ce</name>
+          <entityField>PAYMENT</entityField>
+        </entityFieldLink>
+        <entityFieldLink>
+          <name>bb0d44ca-671e-4a0f-87dc-a94e214bca54</name>
+          <entityField>REMARK</entityField>
+        </entityFieldLink>
+      </fields>
+    </genericViewTemplate>
+  </children>
+</neonView>

others/db_changes/data/example_contract/CONTRACT_42154311.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="m.schroeger" id="c7ea5e6e-aff2-4cf5-95f1-f5ca1b350dd0">
+        <insert tableName="CONTRACT">
+            <column name="CONTRACTID" value="384c9d31-9923-4e6a-8a7f-2d2890470b70"/>
+            <column name="USER_NEW" value="Martin"/>
+            <column name="DATE_NEW" valueDate="2018-10-05T03:34:29"/>
+            <column name="RELATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+            <column name="CONTRACTCODE" value="42154311"/>
+            <column name="PAYMENT" valueNumeric="2"/>
+            <column name="CONTRACTTYPE" valueNumeric="0"/>
+            <column name="CONTRACTSTATUS" valueNumeric="1"/>
+            <column name="CONTRACTEND" valueDate="2019-09-30T00:00:00"/>
+            <column name="CONTRACTSTART" valueDate="2018-10-01T00:00:00"/>
+            <column name="CONTRACTDUE" valueDate="2019-01-01T00:00:00"/>
+        </insert>
+        
+        <rollback>
+            <delete tableName="CONTRACT">
+                <where>CONTRACTID = ?</where>
+                <whereParams>
+                    <param value="384c9d31-9923-4e6a-8a7f-2d2890470b70"/>
+                </whereParams>
+            </delete>
+        </rollback>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

others/db_changes/masterChangelog.xml

@@ -8,10 +8,12 @@
     <include file="struct/relationChangePERSID.xml"/>
     <include file="struct/create_address.xml"/>
     <include file="struct/create_comm.xml"/>
+    <include file="struct/create_contract.xml"/>
     <include file="misc/1535533490181_persChanges.xml"/>
     <include file="struct/1535612802325_addressChange.xml"/>
     <include file="data/example_org/ORG_privat.xml"/>
     <include file="data/example_org/ORG_gfk.xml"/>
     <include file="data/example_pers/PERS_pfiffig.xml"/>
     <include file="data/example_pers/PERS_sommer.xml"/>
+    <include file="data/example_contract/CONTRACT_42154311.xml"/>
 </databaseChangeLog>

others/db_changes/struct/create_contract.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="m.schroeger" id="fdf350de-cff9-4be1-bcbe-61ec9a46c9f0">
+        <createTable tableName="CONTRACT">
+            <column name="CONTRACTCODE" type="VARCHAR(30)"/>
+            <column name="CONTRACTDUE" type="TIMESTAMP"/>
+            <column name="CONTRACTEND" type="TIMESTAMP"/>
+            <column name="CONTRACTSTART" type="TIMESTAMP"/>
+            <column name="CONTRACTID" type="CHAR(36)">
+                <constraints primaryKey="true" primaryKeyName="PK_CONTRACT_CONTRACTID"/>
+            </column>
+            <column name="CONTRACTSTATUS" type="INTEGER"/>
+            <column name="CONTRACTTYPE" type="INTEGER"/>
+            <column name="USER_EDIT" type="VARCHAR(50)"/>
+            <column name="USER_NEW" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="DATE_NEW" type="TIMESTAMP">
+                <constraints nullable="false"/>
+            </column>
+            <column name="DATE_EDIT" type="TIMESTAMP"/>
+            <column name="PAYMENT" type="INTEGER"/>
+            <column name="REMARK" type="CLOB"/>
+            <column name="RELATION_ID" type="CHAR(36)"/>
+        </createTable>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file

preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod

@@ -2,7 +2,7 @@
 <preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.1">
   <name>_____PREFERENCES_PROJECT</name>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <projectName>xRM-Basic-5</projectName>
+  <projectName>xRM-Basic</projectName>
   <jditoMaxContentSize v="57671680" />
   <calendarCategoriesEvent>
     <entry>

process/Date_lib/Date_lib.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.7" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.1.7">
+  <name>Date_lib</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/Date_lib/process.js</process>
+</process>

process/Date_lib/process.js

+/**
+ * provides methods for interactions with dates
+ */
+function DateUtils(){
+
+    /**
+     * Validates two date inputs (beginning should always be before the end!)
+     * 
+     * @param pStart {Number}
+     * @param pEnd {Number}
+     * 
+     * @result {Boolean|null} Boolean if it was able to check smth or null if the input values were not valid
+     */
+    this.validateBeginnBeforeEnd = function(pStart, pEnd) {
+        if (pStart == "" || pStart == null || pEnd == "" || pEnd == null) return null
+        return pStart <= pEnd;
+    }
+
+}
\ No newline at end of file

process/Keyword_lib/process.js

@@ -121,6 +121,29 @@ function KeywordUtils(){
                     ,createKeywordEntry("o", translate.text("${GENDER_OTHER}"))
                 ]);
                 break;
+            case "CONTRACT.CONTRACTTYPE":
+                valueContainer = createKeywordEntriesContainer([
+                     createKeywordEntry("0", translate.text("Rahmenvertrag"))
+                    ,createKeywordEntry("1", translate.text("Werksvertrag"))
+                    ,createKeywordEntry("2", translate.text("Wartungsvertrag"))
+                ]);
+                break;
+            case "CONTRACT.CONTRACTSTATUS":
+                valueContainer = createKeywordEntriesContainer([
+                     createKeywordEntry("0", translate.text("gültig, unbefristet"))
+                    ,createKeywordEntry("1", translate.text("gültig, befristet"))
+                    ,createKeywordEntry("2", translate.text("noch nicht unterschrieben"))
+                    ,createKeywordEntry("3", translate.text("keiner, Einzelberechnung"))
+                    ,createKeywordEntry("4", translate.text("gekündigt"))
+                ]);
+                break;
+            case "CONTRACT.PAYMENT":
+                valueContainer = createKeywordEntriesContainer([
+                     createKeywordEntry("0", translate.text("jährlich"))
+                    ,createKeywordEntry("1", translate.text("halbjährlich"))
+                    ,createKeywordEntry("2", translate.text("vierteljährlich"))
+                ]);
+                break;
             default: 
                 throw new Error(translate.withArguments("[%0]the given keyword \"%1\" has no match with the possible keywordlist", [
                     arguments.callee.name, keywordType

system/default/default.aod

@@ -6,4 +6,5 @@
   <aditoHomePath>$ADITOHOME</aditoHomePath>
   <aditoDataPath>$PROJECTHOME/data</aditoDataPath>
   <loginUser>Admin</loginUser>
+  <loginPassword>a</loginPassword>
 </system>