Skip to content
Snippets Groups Projects
Commit cfc98fbe authored by Benjamin Ulrich's avatar Benjamin Ulrich :speech_balloon: Committed by Johannes Goderbauer
Browse files

[Projekt: Entwicklung - Neon][TicketNr.: 1062542][Besuchsplanung -... 

[Projekt: Entwicklung - Neon][TicketNr.: 1062542][Besuchsplanung - Neuanlage/Bearbeiten: combo mitarbeiter enthält alle Kontakte]
parent 6ee2f364
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 18 additions and 36 deletions
entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
+ 5
− 6
View file @ cfc98fbe
......@@ -33,11 +33,10 @@
<title>Info</title>
</entityField>
<entityField>
<name>PERSON_ID</name>
<name>CONTACT_ID</name>
<title>Employee</title>
<consumer>Persons</consumer>
<valueProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/entityfields/person_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/entityfields/person_id/displayValueProcess.js</displayValueProcess>
<state>INVISIBLE</state>
<valueProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/entityfields/contact_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>icon</name>
......@@ -134,11 +133,11 @@
<recordfield>VISITPLANEMPLOYEEWEEK.INFO</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_ID.value</name>
<name>CONTACT_ID.value</name>
<recordfield>VISITPLANEMPLOYEEWEEK.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERSON_ID.displayValue</name>
<name>CONTACT_ID.displayValue</name>
<expression>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/recordcontainers/db/recordfieldmappings/person_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings>
......
entity/VisitPlanEmployeeWeek_entity/entityfields/person_id/valueProcess.js → entity/VisitPlanEmployeeWeek_entity/entityfields/contact_id/valueProcess.js
+ 1
− 2
View file @ cfc98fbe
......@@ -2,7 +2,6 @@ import("system.neon");
import("system.result");
import("Employee_lib");
import("system.vars");
import("Sql_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
result.string(EmployeeUtils.getCurrentContactId());
result.string(EmployeeUtils.getCurrentContactId());
\ No newline at end of file
entity/VisitPlanEmployeeWeek_entity/entityfields/person_id/displayValueProcess.js deleted 100644 → 0
+ 0
− 7
View file @ 6ee2f364
import("system.result");
import("system.vars");
import("Contact_lib");
//show the simple title since this will be later an employee-entry and therefore no organisation is needed
var title = ContactUtils.getTitleByContactId(vars.get("$field.PERSON_ID"));
result.string(title);
neonView/VisitPlanEmployeeWeekEdit_view/VisitPlanEmployeeWeekEdit_view.aod
+ 4
− 4
View file @ cfc98fbe
......@@ -16,10 +16,6 @@
<entityField>#ENTITY</entityField>
<isEditable v="true" />
<fields>
<entityFieldLink>
<name>a066671d-5efb-4123-afe6-a4a420342b17</name>
<entityField>PERSON_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>fb5eb7db-38f3-46d7-8694-8c11a05a3d74</name>
<entityField>WEEK</entityField>
......@@ -32,6 +28,10 @@
<name>6e656a20-41a5-4fe7-9b4a-ba2e3629ade1</name>
<entityField>INFO</entityField>
</entityFieldLink>
<entityFieldLink>
<name>0c0f5a7d-296c-46ee-9ecb-baefe3a96621</name>
<entityField>CONTACT_ID</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
</children>
......
neonView/VisitPlanEmployeeWeekFilter_view/VisitPlanEmployeeWeekFilter_view.aod
+ 5
− 8
View file @ cfc98fbe
......@@ -12,6 +12,8 @@
<tableViewTemplate>
<name>Table</name>
<entityField>#ENTITY</entityField>
<linkedColumns />
<fixedFilterFields />
<columns>
<neonTableColumn>
<name>a3f48ebd-9472-4388-8525-8351bdc90715</name>
......@@ -25,10 +27,6 @@
<name>41e665d5-0bcf-4e33-8080-809d839da15d</name>
<entityField>YEAR</entityField>
</neonTableColumn>
<neonTableColumn>
<name>92095268-0400-462d-9a6c-227d9f6966d4</name>
<entityField>PERSON_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>a5b55587-841d-42d5-b4b7-eff55f6f6858</name>
<entityField>entriescount</entityField>
......@@ -54,6 +52,9 @@
<treeTableViewTemplate>
<name>Treetable</name>
<entityField>#ENTITY</entityField>
<linkedColumns />
<defaultGroupFields />
<fixedFilterFields />
<columns>
<neonTreeTableColumn>
<name>555cdb41-0bad-40e8-afad-f389ff0a9910</name>
......@@ -67,10 +68,6 @@
<name>6a11aa05-3879-46f2-9944-2006d9caf928</name>
<entityField>YEAR</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>bb232878-5316-4b8f-9c0e-02833e588544</name>
<entityField>PERSON_ID</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>8db139d9-7dd7-4ea2-9c73-1c0accec2ef5</name>
<entityField>entriescount</entityField>
......
neonView/VisitPlanEmployeeWeekPreview_view/VisitPlanEmployeeWeekPreview_view.aod
+ 3
− 9
View file @ cfc98fbe
......@@ -14,22 +14,15 @@
<cardViewTemplate>
<name>Card</name>
<iconField>icon</iconField>
<titleField>PERSON_ID</titleField>
<titleField>WEEK</titleField>
<entityField>#ENTITY</entityField>
<isEditable v="false" />
<informationField>YEAR</informationField>
</cardViewTemplate>
<genericViewTemplate>
<name>Generic</name>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
<name>5dcc40c3-a5e9-4030-a0bd-50282c361c0e</name>
<entityField>WEEK</entityField>
</entityFieldLink>
<entityFieldLink>
<name>e75e5ce2-9702-4885-a12d-64afe780b728</name>
<entityField>YEAR</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9e6bca10-ce10-4f90-a5e5-f70c680edb25</name>
<entityField>INFO</entityField>
......@@ -38,6 +31,7 @@
</genericViewTemplate>
<scoreCardViewTemplate>
<name>Score_Card</name>
<fieldActions />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
......
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