Merge branch '2021.0_CWi_1074765' into '2021.0'

[Projekt: xRM-Sales][TicketNr.: 1074765][[Besuchsplanung] Locale in der Besuchsplanung berücksichtigen]

See merge request xrm/basic!745

entity/VisitPlanEmployeeWeek_entity/entityfields/week/valueProcess.js

@@ -6,4 +6,6 @@ import("system.vars");
 
 //use current week if recordstate = new and this field empty
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-    result.string(datetime.toDate(vars.get("$sys.date"), "w"));
+{
+    result.string(datetime.toLocaleDate(vars.get("$sys.date"), "w"));
+}
\ No newline at end of file

entity/VisitPlanEmployeeWeek_entity/entityfields/year/onValidation.js

@@ -5,6 +5,6 @@ import("system.vars");
 import("system.result");
 
 var year = eMath.absInt(vars.get("$local.value"));
-var currentYear = eMath.absInt(datetime.toDate(vars.get("$sys.date"), "yyyy"));
+var currentYear = eMath.absInt(datetime.toLocaleDate(vars.get("$sys.date"), "yyyy"));
 if(year < currentYear || year >= 10000 )
     result.string(translate.text("Invalid year!"));

entity/VisitPlanEmployeeWeek_entity/entityfields/year/valueProcess.js

@@ -5,4 +5,6 @@ import("system.neon");
 import("system.vars");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-    result.string(datetime.toDate(vars.get("$sys.date"), "yyyy"));
\ No newline at end of file
+{    
+    result.string(datetime.toLocaleDate(vars.get("$sys.date"), "yyyy"));
+}
\ No newline at end of file

entity/VisitPlanEntry_entity/afterSave.js

@@ -26,8 +26,8 @@ if(savedData["STATUS_APPOINTMENT"] == "VISITSTATUSAPPOINTMENTCONFIRMED")
     var description = savedData["CONTACT_ID.displayValue"];
     var standardMail = CommUtil.getStandardMail(savedData["CONTACT_ID"]); 
     
-    var entryDate = datetime.toDate(savedData["ENTRYDATE"], "dd-MM-yyyy");
-    var startTime = entryDate + " " + datetime.toDate(savedData["BEGIN_TIME"], "HH:mm:ss.S");
+    var entryDate = datetime.toLocaleDate(savedData["ENTRYDATE"], "dd-MM-yyyy");
+    var startTime = entryDate + " " + datetime.toLocaleDate(savedData["BEGIN_TIME"], "HH:mm:ss.S");
         startTime = datetime.toLong(startTime, "dd-MM-yyyy HH:mm:ss.S");
     var endTime = savedData["END_TIME"];
     var duration = eMath.subInt(endTime, startTime);

entity/VisitPlanEntry_entity/entityfields/begin_time/onValueChange.js

@@ -3,7 +3,11 @@ import("system.vars");
 import("system.eMath");
 import("system.neon");
 
-if(datetime.toDate(vars.get("$this.value"), "HH:mm") == "23:00")
+if(datetime.toLocaleDate(vars.get("$this.value"), "HH:mm") == "23:00")
+{
     neon.setFieldValue("$field.END_TIME", eMath.absInt(vars.get("$this.value")) + datetime.ONE_MINUTE * 30);
+}
 else
-    neon.setFieldValue("$field.END_TIME", eMath.absInt(vars.get("$this.value")) + datetime.ONE_HOUR);
\ No newline at end of file
+{
+    neon.setFieldValue("$field.END_TIME", eMath.absInt(vars.get("$this.value")) + datetime.ONE_HOUR);
+}
\ No newline at end of file

entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js

@@ -28,8 +28,8 @@ var standardMail = CommUtil.getStandardMail(selectionRowData[0].CONTACT_ID);
 var startTime = selectionRowData[0].BEGIN_TIME;
 var endTime = selectionRowData[0].END_TIME;
 var duration = eMath.subInt(endTime, startTime);
-var entryDate = datetime.toDate(selectionRowData[0].ENTRYDATE, "dd-MM-yyyy");
-startTime = entryDate + " " + datetime.toDate(selectionRowData[0].BEGIN_TIME, "HH:mm:ss.S");
+var entryDate = datetime.toLocaleDate(selectionRowData[0].ENTRYDATE, "dd-MM-yyyy");
+startTime = entryDate + " " + datetime.toLocaleDate(selectionRowData[0].BEGIN_TIME, "HH:mm:ss.S");
 startTime = datetime.toLong(startTime, "dd-MM-yyyy HH:mm:ss.S");
 
 var links = [

entity/VisitPlanEntry_entity/entityfields/entrydate/onValueChange.js

@@ -8,8 +8,8 @@ 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 calendarWeek = datetime.toLocaleDate(vars.get("$field.ENTRYDATE"), "w");
+var calendarYear = datetime.toLocaleDate(vars.get("$field.ENTRYDATE"), "yyyy");
 var info = newSelect("INFO")
                         .from("VISITPLANEMPLOYEEWEEK") 
                         .where("VISITPLANEMPLOYEEWEEK.VISITPLAN_WEEK", calendarWeek)

entity/VisitPlanEntry_entity/entityfields/visitplanemployeeweek_info/valueProcess.js

@@ -7,8 +7,8 @@ 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 calendarWeek = datetime.toLocaleDate(vars.get("$field.ENTRYDATE"), "w");
+var calendarYear = datetime.toLocaleDate(vars.get("$field.ENTRYDATE"), "yyyy");
 var info = newSelect("INFO")
                         .from("VISITPLANEMPLOYEEWEEK") 
                         .where("VISITPLANEMPLOYEEWEEK.VISITPLAN_WEEK", calendarWeek)

entity/VisitPlanEntry_entity/onValidation.js

@@ -21,7 +21,7 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$param.
                                 .from("VISITPLANEMPLOYEEWEEK")
                                 .where("VISITPLANEMPLOYEEWEEK.VISITPLANEMPLOYEEWEEKID", vars.get("$field.VISITPLANEMPLOYEEWEEK_ID"))
                                 .cell();                
-    weekEntrydate = eMath.absInt(datetime.toDate(vars.get("$field.ENTRYDATE"), "w"))
+    weekEntrydate = eMath.absInt(datetime.toLocaleDate(vars.get("$field.ENTRYDATE"), "w"))
 
     if(week != weekEntrydate)
         result.string(translate.text("Entrydate has to be in the selected calendar week!"));

entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js

@@ -30,8 +30,8 @@ else if(vars.exists("$param.Entries_param") && vars.get("$param.Entries_param"))
 }
 else if(vars.exists("$param.EntriesofCurrentWeek_param") && vars.get("$param.EntriesofCurrentWeek_param") == "true")
 {
-    var currentWeek = datetime.toDate(vars.get("$sys.date"), "w");
-    var currentYear = datetime.toDate(vars.get("$sys.date"), "yyyy");
+    var currentWeek = datetime.toLocaleDate(vars.get("$sys.date"), "w");
+    var currentYear = datetime.toLocaleDate(vars.get("$sys.date"), "yyyy");
     var currentUser = EmployeeUtils.getCurrentContactId();
     
     entrySQL.join("VISITPLANEMPLOYEEWEEK", "VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID = VISITPLANEMPLOYEEWEEK.VISITPLANEMPLOYEEWEEKID")
@@ -53,8 +53,8 @@ if(entryData.length > 0)
         
         var contactname = ContactUtils.getTitleByContactId(contactId);
         var orgname = OrganisationUtils.getNameByContactId(organisationContactId);
-        var parentName = translate.text(datetime.toDate(entryDateRaw, "EEEE"));
-        entryDate = datetime.toDate(entryDateRaw, "dd.MM.yyyy");
+        var parentName = translate.text(datetime.toLocaleDate(entryDateRaw, "EEEE"));
+        entryDate = datetime.toLocaleDate(entryDateRaw, "dd.MM.yyyy");
 
         var statusDisplay = KeywordUtils.getViewValue($KeywordRegistry.visitPlanEntryStatus(), status)
         var statusAppointmentDisplay = KeywordUtils.getViewValue($KeywordRegistry.visitPlanEntryStatusAppointment(), statusAppointment)

entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js

@@ -14,8 +14,8 @@ if(vars.get("$param.Entries_param") != null)
     visitPlanEmployeeWeekID = vars.get("$param.Entries_param");
 else
 {
-    var calendarWeek = datetime.toDate(vars.get("$field.ENTRYDATE"), "w");
-    var calendarYear = datetime.toDate(vars.get("$field.ENTRYDATE"), "yyyy");
+    var calendarWeek = datetime.toLocaleDate(vars.get("$field.ENTRYDATE"), "w");
+    var calendarYear = datetime.toLocaleDate(vars.get("$field.ENTRYDATE"), "yyyy");
     var weekId = newSelect("VISITPLANEMPLOYEEWEEKID")
                             .from("VISITPLANEMPLOYEEWEEK") 
                             .where("VISITPLANEMPLOYEEWEEK.VISITPLAN_WEEK", calendarWeek)

entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js

@@ -9,8 +9,8 @@ import("system.vars");
 
 var rowData = vars.get("$local.rowdata");
 var user = EmployeeUtils.getCurrentContactId()
-var calendarWeek = datetime.toDate(rowData["ENTRYDATE.value"], "w");
-var calendarYear = datetime.toDate(rowData["ENTRYDATE.value"], "yyyy");
+var calendarWeek = datetime.toLocaleDate(rowData["ENTRYDATE.value"], "w");
+var calendarYear = datetime.toLocaleDate(rowData["ENTRYDATE.value"], "yyyy");
 var weekId = newSelect("VISITPLANEMPLOYEEWEEKID")
                         .from("VISITPLANEMPLOYEEWEEK") 
                         .where("VISITPLANEMPLOYEEWEEK.VISITPLAN_WEEK", calendarWeek)

entity/VisitPlanEntry_entity/recordcontainers/jdito/rowCountProcess.js

@@ -29,7 +29,7 @@ if(entryData.length > 0)
 {
     for(var i = 0; i < entryData.length; i++)
     {
-        var parentName = translate.text(datetime.toDate(entryData[i][0], "EEEE"));
+        var parentName = translate.text(datetime.toLocaleDate(entryData[i][0], "EEEE"));
         if(!vars.exists("$local.idvalues") || !vars.get("$local.idvalues"))
         {
             if(group.indexOf(parentName) == -1)