[Projekt: Crowd-Development / Besuch vor Ort][TicketNr.: 1066740][[aus...

[Projekt: Crowd-Development / Besuch vor Ort][TicketNr.: 1066740][[aus Schmalz] Neuer Wochenplaneintrag]

entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod

@@ -49,6 +49,13 @@
       <inputFormat>dd.MM.yyyy</inputFormat>
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entrydate/valueProcess.js</valueProcess>
+      <onValueChange>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/entrydate/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+        <element>RECORD</element>
+      </onValueChangeTypes>
     </entityField>
     <entityField>
       <name>END_TIME</name>
@@ -226,6 +233,21 @@
       <name>Entrydate_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityField>
+      <name>VISITPLANEMPLOYEEWEEK_INFO</name>
+      <color>priority-high-color</color>
+      <state>INVISIBLE</state>
+      <stateProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/visitplanemployeeweek_info/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/visitplanemployeeweek_info/valueProcess.js</valueProcess>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+        <element>PROCESS_SETVALUE</element>
+      </onValueChangeTypes>
+    </entityField>
+    <entityField>
+      <name>STATUS_APPOINTMENT</name>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>

entity/VisitPlanEntry_entity/entityfields/entrydate/onValueChange.js

+import("system.neon");
+import("system.logging");
+import("system.translate");
+import("system.result");
+import("Sql_lib");
+import("system.vars");
+import("system.datetime");
+import("Employee_lib");
+
+var user = EmployeeUtils.getCurrentContactId();
+var calendarWeek = datetime.toDate(vars.get("$field.ENTRYDATE"), "w");
+var calendarYear = datetime.toDate(vars.get("$field.ENTRYDATE"), "yyyy");
+var info = newSelect("INFO")
+                        .from("VISITPLANEMPLOYEEWEEK") 
+                        .where("VISITPLANEMPLOYEEWEEK.VISITPLAN_WEEK", calendarWeek)
+                        .and("VISITPLANEMPLOYEEWEEK.VISITPLAN_YEAR", calendarYear)
+                        .and("VISITPLANEMPLOYEEWEEK.CONTACT_ID", user)
+                        .cell();
+
+if(info)
+    neon.setFieldValue("$field.VISITPLANEMPLOYEEWEEK_INFO", "Calendar week: " + calendarWeek + " Info: " + info);
+else
+    neon.setFieldValue("$field.VISITPLANEMPLOYEEWEEK_INFO", "");
+
+

entity/VisitPlanEntry_entity/entityfields/visitplanemployeeweek_info/stateProcess.js

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

entity/VisitPlanEntry_entity/entityfields/visitplanemployeeweek_info/valueProcess.js

+import("system.logging");
+import("system.translate");
+import("system.result");
+import("Sql_lib");
+import("system.vars");
+import("system.datetime");
+import("Employee_lib");
+
+var user = EmployeeUtils.getCurrentContactId();
+var calendarWeek = datetime.toDate(vars.get("$field.ENTRYDATE"), "w");
+var calendarYear = datetime.toDate(vars.get("$field.ENTRYDATE"), "yyyy");
+var info = newSelect("INFO")
+                        .from("VISITPLANEMPLOYEEWEEK") 
+                        .where("VISITPLANEMPLOYEEWEEK.VISITPLAN_WEEK", calendarWeek)
+                        .and("VISITPLANEMPLOYEEWEEK.VISITPLAN_YEAR", calendarYear)
+                        .and("VISITPLANEMPLOYEEWEEK.CONTACT_ID", user)
+                        .cell();
+
+if(info)
+    result.string(translate.text("Calendar week: " + calendarWeek + " Info: " + info));
\ No newline at end of file

entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js

@@ -130,10 +130,6 @@ if(idValues == false)
      
     for (var i = 0; i < visitFrequencyData.length; i++)
     {
-        logging.log(visitFrequencyData[i][7])
-        logging.log($KeywordRegistry.visitRecommendationPrioSource())
-        logging.log(KeywordUtils.getViewValue($KeywordRegistry.visitRecommendationPrioSource(), visitFrequencyData[i][7]))
-        
         tmpData = [];
         tmpData[0] = visitFrequencyData[i][1]; //UID.value
         tmpData[1] = visitFrequencyData[i][9]; //ORGANISATION_NAME.value
@@ -233,10 +229,7 @@ var filterFns = {
         return false;
     }
 };
-logging.log(JSON.stringify(filter.filter));
 recommendationData = JditoFilterUtils.filterRecords(filterFields, recommendationData, filter.filter, filterFns);
-        
-
 result.object(recommendationData);
 
 function getPrioByDueDate(pDueDate)

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -3167,6 +3167,10 @@
       <key>Singapore</key>
       <value>Singapur</value>
     </entry>
+    <entry>
+      <key>Calendar week</key>
+      <value>Kalenderwoche</value>
+    </entry>
     <entry>
       <key>French Guiana</key>
       <value>Französisch-Guayana</value>

neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod

@@ -18,6 +18,10 @@
       <defaultGroupFields>
         <element>CONTAINER</element>
       </defaultGroupFields>
+      <maxDBRow v="400" />
+      <isCreatable v="true" />
+      <isDeletable v="true" />
+      <isEditable v="true" />
       <columns>
         <neonTreeTableColumn>
           <name>6100879d-dc6a-4c7e-b750-f5b7e627f48a</name>

neonView/VisitPlanEntryEdit_view/VisitPlanEntryEdit_view.aod

@@ -40,6 +40,10 @@
           <name>75e0b2e9-2cd9-4d27-a696-2494ec79daa4</name>
           <entityField>END_TIME</entityField>
         </entityFieldLink>
+        <entityFieldLink>
+          <name>78926e28-339b-41fe-a9bf-e5a49d07508f</name>
+          <entityField>VISITPLANEMPLOYEEWEEK_INFO</entityField>
+        </entityFieldLink>
       </fields>
     </genericViewTemplate>
   </children>