From f70254fe4c6d271dfcf2f195943afe740ad04cba Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 26 Jul 2019 16:53:25 +0200
Subject: [PATCH] Field renaming Timetracking
---
.../basic/init/struct/create_timetracking.xml | 4 +-
aliasDefinition/Data_alias/Data_alias.aod | 70 ++++++++-----------
.../Timetracking_entity.aod | 28 ++++----
.../{date => trackingdate}/valueProcess.js | 0
.../displayValueProcess.js | 0
.../onValidation.js | 0
.../titleProcess.js | 0
.../TimetrackingEdit_view.aod | 8 +--
.../TimetrackingFilter_view.aod | 4 +-
.../TimetrackingPreview_view.aod | 8 +--
10 files changed, 54 insertions(+), 68 deletions(-)
rename entity/Timetracking_entity/entityfields/{date => trackingdate}/valueProcess.js (100%)
rename entity/Timetracking_entity/entityfields/{minutes => trackingminutes}/displayValueProcess.js (100%)
rename entity/Timetracking_entity/entityfields/{minutes => trackingminutes}/onValidation.js (100%)
rename entity/Timetracking_entity/entityfields/{minutes => trackingminutes}/titleProcess.js (100%)
diff --git a/.liquibase/Data_alias/basic/init/struct/create_timetracking.xml b/.liquibase/Data_alias/basic/init/struct/create_timetracking.xml
index 1f7bf1ed6cd..0838384d44c 100644
--- a/.liquibase/Data_alias/basic/init/struct/create_timetracking.xml
+++ b/.liquibase/Data_alias/basic/init/struct/create_timetracking.xml
@@ -6,7 +6,7 @@
<constraints primaryKey="true" primaryKeyName="PK_TIMETRACKING_TIMETRACKINGID"/>
</column>
<column name="INFO" type="NCLOB"/>
- <column name="MINUTES" type="INTEGER">
+ <column name="TRACKINGMINUTES" type="INTEGER">
<constraints nullable="false"/>
</column>
<column name="OBJECT_ID" type="NVARCHAR(36)">
@@ -19,7 +19,7 @@
<constraints foreignKeyName="FK_TIMETRACKING_CONTACT_ID" references="CONTACT(CONTACTID)"/>
</column>
- <column name="DATE" type="DATETIME">
+ <column name="TRACKINGDATE" type="DATETIME">
<constraints nullable="false"/>
</column>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 53f1fceebb0..6d6d8f4c985 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -3845,27 +3845,6 @@
<syncIds></syncIds>
</auditSyncConfig>
<entityFields>
- <entityFieldDb>
- <name>DATE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title>Date</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- </customProperties>
- </entityFieldDb>
<entityFieldDb>
<name>TIMETRACKINGID</name>
<dbName></dbName>
@@ -3901,27 +3880,6 @@
</customBooleanProperty>
</customProperties>
</entityFieldDb>
- <entityFieldDb>
- <name>MINUTES</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title>Time</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- </customProperties>
- </entityFieldDb>
<entityFieldDb>
<name>CONTACT_ID</name>
<dbName></dbName>
@@ -3985,6 +3943,34 @@
</customBooleanProperty>
</customProperties>
</entityFieldDb>
+ <entityFieldDb>
+ <name>TRACKINGMINUTES</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>TRACKINGDATE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index f63061dc36d..28c5be869ea 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -20,13 +20,13 @@
</onValueChangeTypes>
</entityField>
<entityField>
- <name>MINUTES</name>
+ <name>TRACKINGMINUTES</name>
<title>Time</title>
<contentType>TEXT</contentType>
<mandatory v="true" />
- <titleProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/titleProcess.js</titleProcess>
- <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js</displayValueProcess>
- <onValidation>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/onValidation.js</onValidation>
+ <titleProcess>%aditoprj%/entity/Timetracking_entity/entityfields/trackingminutes/titleProcess.js</titleProcess>
+ <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/trackingminutes/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/Timetracking_entity/entityfields/trackingminutes/onValidation.js</onValidation>
</entityField>
<entityField>
<name>OBJECT_ID</name>
@@ -53,14 +53,14 @@
<name>TIMETRACKINGID</name>
</entityField>
<entityField>
- <name>DATE</name>
+ <name>TRACKINGDATE</name>
<title>Date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
<outputFormat>dd.MM.yyyy</outputFormat>
<inputFormat>dd.MM.yyyy</inputFormat>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/date/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/trackingdate/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>ObjectId_param</name>
@@ -142,18 +142,10 @@
</linkInformation>
</linkInformation>
<recordFieldMappings>
- <dbRecordFieldMapping>
- <name>DATE.value</name>
- <recordfield>TIMETRACKING.DATE</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>INFO.value</name>
<recordfield>TIMETRACKING.INFO</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>MINUTES.value</name>
- <recordfield>TIMETRACKING.MINUTES</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OBJECT_ID.value</name>
<recordfield>TIMETRACKING.OBJECT_ID</recordfield>
@@ -174,6 +166,14 @@
<name>CONTACT_ID.displayValue</name>
<expression>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TRACKINGDATE.value</name>
+ <recordfield>TIMETRACKING.TRACKINGDATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TRACKINGMINUTES.value</name>
+ <recordfield>TIMETRACKING.TRACKINGMINUTES</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Timetracking_entity/entityfields/date/valueProcess.js b/entity/Timetracking_entity/entityfields/trackingdate/valueProcess.js
similarity index 100%
rename from entity/Timetracking_entity/entityfields/date/valueProcess.js
rename to entity/Timetracking_entity/entityfields/trackingdate/valueProcess.js
diff --git a/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js b/entity/Timetracking_entity/entityfields/trackingminutes/displayValueProcess.js
similarity index 100%
rename from entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js
rename to entity/Timetracking_entity/entityfields/trackingminutes/displayValueProcess.js
diff --git a/entity/Timetracking_entity/entityfields/minutes/onValidation.js b/entity/Timetracking_entity/entityfields/trackingminutes/onValidation.js
similarity index 100%
rename from entity/Timetracking_entity/entityfields/minutes/onValidation.js
rename to entity/Timetracking_entity/entityfields/trackingminutes/onValidation.js
diff --git a/entity/Timetracking_entity/entityfields/minutes/titleProcess.js b/entity/Timetracking_entity/entityfields/trackingminutes/titleProcess.js
similarity index 100%
rename from entity/Timetracking_entity/entityfields/minutes/titleProcess.js
rename to entity/Timetracking_entity/entityfields/trackingminutes/titleProcess.js
diff --git a/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod b/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
index 77a7aba0256..cef182c6f09 100644
--- a/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
+++ b/neonView/TimetrackingEdit_view/TimetrackingEdit_view.aod
@@ -15,16 +15,16 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>8a0941a2-2c33-4a66-a460-5f2f7258e051</name>
- <entityField>DATE</entityField>
+ <name>6bf1e6e0-6cf1-46e6-8fd1-e88dec5a83a7</name>
+ <entityField>TRACKINGDATE</entityField>
</entityFieldLink>
<entityFieldLink>
<name>8c27f579-543a-484f-ba3d-ba0579e6db12</name>
<entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>ef97d0da-a0d4-4147-b440-96d249ffec73</name>
- <entityField>MINUTES</entityField>
+ <name>d485bdf8-5ebf-4bcc-b4ea-7423ea449206</name>
+ <entityField>TRACKINGMINUTES</entityField>
</entityFieldLink>
<entityFieldLink>
<name>57370b00-130c-439e-9b70-fd56fc28c892</name>
diff --git a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
index 2fc5066539d..781a1c3906e 100644
--- a/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
+++ b/neonView/TimetrackingFilter_view/TimetrackingFilter_view.aod
@@ -20,7 +20,7 @@
<columns>
<neonTableColumn>
<name>fa423332-8987-4fc2-981c-66447678b922</name>
- <entityField>DATE</entityField>
+ <entityField>TRACKINGDATE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>63068c6c-1508-47f2-ad2e-bbe66a448af1</name>
@@ -28,7 +28,7 @@
</neonTableColumn>
<neonTableColumn>
<name>7e18967d-3c78-4f75-bc03-f6d925553484</name>
- <entityField>MINUTES</entityField>
+ <entityField>TRACKINGMINUTES</entityField>
</neonTableColumn>
<neonTableColumn>
<name>e17a680c-5a05-42a1-ab34-067a97192690</name>
diff --git a/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod b/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
index c14eba29733..c75b62ce110 100644
--- a/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
+++ b/neonView/TimetrackingPreview_view/TimetrackingPreview_view.aod
@@ -19,12 +19,12 @@
<entityField>CONTACT_ID</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>64005996-e735-4c5d-bdb7-29aaf8851107</name>
- <entityField>DATE</entityField>
+ <name>ce7d8cc0-ac9c-4195-861f-23483db6cd91</name>
+ <entityField>TRACKINGDATE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>25921a31-5563-4a74-aa7e-67d660c60f0b</name>
- <entityField>MINUTES</entityField>
+ <name>45f4f97c-5fde-4c90-9dba-4e5b540328b3</name>
+ <entityField>TRACKINGMINUTES</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
--
GitLab