Skip to content
Snippets Groups Projects
Commit 7edf40f5 authored by Andre Loreth's avatar Andre Loreth
Browse files

Merge remote-tracking branch 'origin/master'

parents 66f97427 699353b9
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1089 additions and 82 deletions
aliasDefinition/Data_alias/Data_alias.aod
+ 911
− 59
View file @ 7edf40f5
This diff is collapsed.
entity/ActivityLink_entity/ActivityLink_entity.aod
+ 32
− 0
View file @ 7edf40f5
......@@ -81,6 +81,22 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
<name>USER_NEW</name>
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -117,6 +133,22 @@
<name>OBJECT_ROWID.displayValue</name>
<expression>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>ACTIVITYLINK.USER_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_EDIT.value</name>
<recordfield>ACTIVITYLINK.USER_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_NEW.value</name>
<recordfield>ACTIVITYLINK.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
<recordfield>ACTIVITYLINK.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/ActivityLink_entity/entityfields/date_edit/valueProcess.js
+ 2
− 2
View file @ 7edf40f5
import("system.vars");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.getString("$sys.date"));
\ No newline at end of file
result.string(vars.get("$sys.date"));
\ No newline at end of file
entity/ActivityLink_entity/entityfields/date_new/valueProcess.js
+ 2
− 2
View file @ 7edf40f5
import("system.vars");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.date"));
\ No newline at end of file
result.string(vars.get("$sys.date"));
\ No newline at end of file
entity/ActivityLink_entity/entityfields/user_edit/valueProcess.js
+ 2
− 2
View file @ 7edf40f5
import("system.vars");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.getString("$sys.user"));
\ No newline at end of file
result.string(vars.get("$sys.user"));
\ No newline at end of file
entity/ActivityLink_entity/entityfields/user_new/valueProcess.js
+ 2
− 2
View file @ 7edf40f5
import("system.vars");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.user"));
\ No newline at end of file
result.string(vars.get("$sys.user"));
\ No newline at end of file
entity/Activity_entity/Activity_entity.aod
+ 32
− 0
View file @ 7edf40f5
......@@ -412,6 +412,22 @@
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>USER_NEW</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -478,6 +494,22 @@
<name>CREATOR.displayValue</name>
<expression>%aditoprj%/entity/Activity_entity/recordcontainers/db/recordfieldmappings/creator.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>ACTIVITY.USER_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_EDIT.value</name>
<recordfield>ACTIVITY.USER_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_NEW.value</name>
<recordfield>ACTIVITY.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
<recordfield>ACTIVITY.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Activity_entity/entityfields/date_edit/valueProcess.js
+ 2
− 2
View file @ 7edf40f5
import("system.vars");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.getString("$sys.date"));
\ No newline at end of file
result.string(vars.get("$sys.date"));
\ No newline at end of file
entity/Activity_entity/entityfields/date_new/valueProcess.js
+ 2
− 2
View file @ 7edf40f5
import("system.vars");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.date"));
\ No newline at end of file
result.string(vars.get("$sys.date"));
\ No newline at end of file
entity/Activity_entity/entityfields/user_edit/valueProcess.js
+ 2
− 2
View file @ 7edf40f5
import("system.vars");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.getString("$sys.user"));
\ No newline at end of file
result.string(vars.get("$sys.user"));
\ No newline at end of file
entity/Activity_entity/entityfields/user_new/valueProcess.js
+ 2
− 2
View file @ 7edf40f5
import("system.vars");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.user"));
\ No newline at end of file
result.string(vars.get("$sys.user"));
\ No newline at end of file
entity/Address_entity/Address_entity.aod
+ 32
− 0
View file @ 7edf40f5
......@@ -250,6 +250,22 @@
</entityParameter>
</children>
</entityConsumer>
<entityField>
<name>USER_NEW</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -322,6 +338,22 @@
<name>ADDR_TYPE.displayValue</name>
<expression>%aditoprj%/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_NEW.value</name>
<recordfield>ADDRESS.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
<recordfield>ADDRESS.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_EDIT.value</name>
<recordfield>ADDRESS.USER_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>ADDRESS.USER_NEW</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/Address_entity/entityfields/date_edit/valueProcess.js 0 → 100644
+ 7
− 0
View file @ 7edf40f5
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.get("$sys.date"));
\ No newline at end of file
entity/Address_entity/entityfields/date_new/valueProcess.js
+ 3
− 3
View file @ 7edf40f5
import("system.vars");
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.date"));
result.string(vars.get("$sys.date"));
\ No newline at end of file
entity/Address_entity/entityfields/user_edit/valueProcess.js 0 → 100644
+ 7
− 0
View file @ 7edf40f5
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.get("$sys.user"));
\ No newline at end of file
entity/Address_entity/entityfields/user_new/valueProcess.js
+ 3
− 2
View file @ 7edf40f5
import("system.vars");
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.user"));
\ No newline at end of file
result.string(vars.get("$sys.user"));
\ No newline at end of file
entity/AttributeRelation_entity/AttributeRelation_entity.aod
+ 32
− 0
View file @ 7edf40f5
......@@ -202,6 +202,22 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
<name>USER_NEW</name>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
......@@ -271,6 +287,22 @@
<name>MEMO_VALUE.value</name>
<recordfield>AB_ATTRIBUTERELATION.MEMO_VALUE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>AB_ATTRIBUTERELATION.USER_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_EDIT.value</name>
<recordfield>AB_ATTRIBUTERELATION.USER_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_NEW.value</name>
<recordfield>AB_ATTRIBUTERELATION.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
<recordfield>AB_ATTRIBUTERELATION.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
......
entity/AttributeRelation_entity/entityfields/date_edit/valueProcess.js 0 → 100644
+ 6
− 0
View file @ 7edf40f5
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.get("$sys.date"));
\ No newline at end of file
entity/AttributeRelation_entity/entityfields/date_new/valueProcess.js
+ 2
− 2
View file @ 7edf40f5
import("system.vars");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.date"));
\ No newline at end of file
result.string(vars.get("$sys.date"));
\ No newline at end of file
entity/AttributeRelation_entity/entityfields/user_edit/valueProcess.js 0 → 100644
+ 6
− 0
View file @ 7edf40f5
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.get("$sys.user"));
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment