Skip to content
Snippets Groups Projects
Commit c9767aed authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Merge branch '1080610_AnpassungKontextVISITPLANENTRY' into '2021.1' 

1080610 anpassung kontext visitplanentry

See merge request xrm/basic!1185
parents 871fcaa9 7f5bd637
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 179 additions and 39 deletions
entity/VisitPlanEntry_entity/entityfields/openroute/documentation.adoc 0 → 100644
+ 1
− 0
View file @ c9767aed
Opens the route to the location(s) of the day via google-maps
\ No newline at end of file
entity/VisitPlanEntry_entity/entityfields/openroute/onActionProcess.js 0 → 100644
+ 3
− 0
View file @ c9767aed
import("VisitPlanning_lib");
VisitPlanningUtils.openRoute();
\ No newline at end of file
entity/VisitPlanEntry_entity/entityfields/openroute/stateProcess.js 0 → 100644
+ 10
− 0
View file @ c9767aed
import("system.result");
import("system.vars");
import("system.neon");
var state = neon.COMPONENTSTATE_DISABLED;
if (vars.get("$sys.selectionRows") != "" && vars.get("$sys.selectionRows") != undefined)
{
state = neon.COMPONENTSTATE_EDITABLE;
}
result.string(state);
\ No newline at end of file
entity/VisitPlanEntry_entity/entityfields/parent_id/valueProcess.js 0 → 100644
+ 11
− 0
View file @ c9767aed
import("system.result");
import("system.vars");
import("system.datetime");
import("system.translate");
var parentName = translate.text(datetime.toDate(vars.get("$field.ENTRYDATE"), "EEEE"));
var entryDate = datetime.toDate(vars.get("$field.ENTRYDATE"), "dd.MM.yyyy");
result.string(parentName + "#" + entryDate);
\ No newline at end of file
entity/VisitPlanEntry_entity/entityfields/parentname/displayValueProcess.js 0 → 100644
+ 11
− 0
View file @ c9767aed
import("system.result");
import("system.vars");
import("system.datetime");
import("system.translate");
var parentName = translate.text(datetime.toDate(vars.get("$field.ENTRYDATE"), "EEEE"));
var entryDate = datetime.toDate(vars.get("$field.ENTRYDATE"), "dd.MM.yyyy");
result.string(parentName + " " + entryDate);
\ No newline at end of file
entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js
+ 0
− 1
View file @ c9767aed
import("system.logging");
import("KeywordRegistry_basic");
import("Contact_lib");
import("system.result");
......
entity/VisitPlanEntry_entity/entityfields/persons/children/orgid_param/valueProcess.js 0 → 100644
+ 9
− 0
View file @ c9767aed
import("system.logging");
import("Sql_lib");
import("system.vars");
import("system.result");
var orgContactId = vars.get("$field.ORGANISATION_CONTACT_ID")
var orgId = newSelect("CONTACT.ORGANISATION_ID").from("CONTACT").where("CONTACT.CONTACTID", orgContactId).cell();
result.string(orgId);
\ No newline at end of file
entity/VisitPlanEntry_entity/entityfields/status/displayValueProcess.js
+ 0
− 1
View file @ c9767aed
import("system.translate");
import("system.logging");
import("system.result");
import("system.vars");
import("Keyword_lib");
......
entity/VisitPlanEntry_entity/entityfields/status_appointment/displayValueProcess.js
+ 0
− 1
View file @ c9767aed
import("system.translate");
import("system.logging");
import("system.result");
import("system.vars");
import("Keyword_lib");
......
entity/VisitPlanEntry_entity/entityfields/status_appointment/onValueChange.js 0 → 100644
+ 7
− 0
View file @ c9767aed
import("system.vars");
import("system.neon");
if(!vars.get("$param.CurrentContext_param"))
{
vars.set("$param.CurrentContext_param", "Status changed");
}
\ No newline at end of file
entity/VisitPlanEntry_entity/entityfields/visitplanemployeeweek_id/valueProcess.js
+ 0
− 1
View file @ c9767aed
import("system.logging");
import("system.neon");
import("system.result");
import("system.vars");
......
entity/VisitPlanEntry_entity/entityfields/visitplanemployeeweek_info/valueProcess.js
+ 0
− 1
View file @ c9767aed
import("system.logging");
import("system.translate");
import("system.result");
import("Sql_lib");
......
entity/VisitPlanEntry_entity/entityfields/uid/valueProcess.js → entity/VisitPlanEntry_entity/entityfields/visitplanentryid/valueProcess.js
+ 9
− 0
View file @ c9767aed
import("system.util");
import("system.neon");
import("system.result");
import("system.vars");
import("system.result");
import("system.neon");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value") && vars.get("$this.value") == null)
result.string(util.getNewUUID());
\ No newline at end of file
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
{
result.string(util.getNewUUID());
}
\ No newline at end of file
entity/VisitPlanEntry_entity/entityfields/visitrecommendation_id/valueProcess.js
+ 0
− 1
View file @ c9767aed
import("system.logging");
import("system.neon");
import("system.result");
import("system.vars");
......
entity/VisitPlanEntry_entity/grantUpdateProcess.js
+ 0
− 1
View file @ c9767aed
import("system.logging");
import("system.vars");
import("system.result");
......
entity/VisitPlanEntry_entity/onValidation.js
+ 0
− 1
View file @ c9767aed
import("system.neon");
import("system.eMath");
import("Sql_lib");
import("system.logging");
import("system.datetime");
import("system.db");
import("system.translate");
......
entity/VisitPlanEntry_entity/recordcontainers/db/conditionProcess.js 0 → 100644
+ 30
− 0
View file @ c9767aed
import("Util_lib");
import("system.result");
import("Employee_lib");
import("system.datetime");
import("system.vars");
import("Sql_lib");
var cond = newWhere();
if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
{
cond.andIfSet("VISITPLANENTRY.VISITPLANENTRYID", vars.get("$local.idvalues"));
}
else if(vars.exists("$param.Entries_param") && vars.get("$param.Entries_param"))
{
cond.andIfSet("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", vars.get("$param.Entries_param"));
}
else if(vars.exists("$param.EntriesofCurrentWeek_param") && Utils.toBoolean(vars.get("$param.EntriesofCurrentWeek_param")))
{
var currentWeek = datetime.toLocaleDate(vars.get("$sys.date"), "w");
var currentYear = datetime.toLocaleDate(vars.get("$sys.date"), "yyyy");
var currentUser = EmployeeUtils.getCurrentContactId();
cond.join("VISITPLANEMPLOYEEWEEK", "VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID = VISITPLANEMPLOYEEWEEK.VISITPLANEMPLOYEEWEEKID")
.where("VISITPLANEMPLOYEEWEEK.VISITPLAN_WEEK", currentWeek)
.and("VISITPLANEMPLOYEEWEEK.VISITPLAN_YEAR", currentYear)
.and("VISITPLANEMPLOYEEWEEK.CONTACT_ID", currentUser);
}
result.string(cond.toString());
\ No newline at end of file
entity/VisitPlanEntry_entity/recordcontainers/jdito/onDelete.js → entity/VisitPlanEntry_entity/recordcontainers/db/onDBDelete.js
+ 6
− 3
View file @ c9767aed
import("system.calendars");
import("system.vars");
import("Calendar_lib");
import("system.neon");
......@@ -11,7 +10,11 @@ var recommendationId = vars.get("$field.VISITRECOMMENDATION_ID");
newWhere("VISITRECOMMENDATION.VISITRECOMMENDATIONID", recommendationId)
.updateData(true, "VISITRECOMMENDATION", ["STATUS"], null, [""]);
calendars.removeEntryByUID(calendars.VEVENT, null, id, null)
new SqlBuilder(SqlUtils.getSystemAlias()).whereIfSet("ASYS_CALENDARBACKEND.ELEMENTUID", id)
.deleteData();
newWhereIfSet("AB_APPOINTMENTLINK.APPOINTMENT_ID", id)
.deleteData();
newWhereIfSet("VISITPLANENTRY.VISITPLANENTRYID", "$field.UID")
newWhereIfSet("VISITPLANENTRY.VISITPLANENTRYID", "$field.VISITPLANENTRYID")
.deleteData();
\ No newline at end of file
entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js → entity/VisitPlanEntry_entity/recordcontainers/db/onDBInsert.js
+ 79
− 0
View file @ c9767aed
......@@ -2,7 +2,6 @@ import("Sql_lib");
import("system.neon");
import("Employee_lib");
import("system.datetime");
import("system.logging");
import("system.db");
import("system.vars");
import("system.util");
......@@ -17,11 +16,11 @@ else
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)
.and("VISITPLANEMPLOYEEWEEK.VISITPLAN_YEAR", calendarYear)
.and("VISITPLANEMPLOYEEWEEK.CONTACT_ID", user)
.cell();
.from("VISITPLANEMPLOYEEWEEK")
.where("VISITPLANEMPLOYEEWEEK.VISITPLAN_WEEK", calendarWeek)
.and("VISITPLANEMPLOYEEWEEK.VISITPLAN_YEAR", calendarYear)
.and("VISITPLANEMPLOYEEWEEK.CONTACT_ID", user)
.cell();
if(weekId)
visitPlanEmployeeWeekID = weekId;
......@@ -30,42 +29,40 @@ else
var newWeekId = util.getNewUUID();
var valuesWeek = [
newWeekId,
calendarWeek,
calendarYear,
user
newWeekId,
calendarWeek,
calendarYear,
user
];
var columnsWeek = [
"VISITPLANEMPLOYEEWEEKID",
"VISITPLAN_WEEK",
"VISITPLAN_YEAR",
"CONTACT_ID",
"VISITPLANEMPLOYEEWEEKID",
"VISITPLAN_WEEK",
"VISITPLAN_YEAR",
"CONTACT_ID",
];
insertData.push(["VISITPLANEMPLOYEEWEEK", columnsWeek, null, valuesWeek]);
db.insertData("VISITPLANEMPLOYEEWEEK", columnsWeek, null, valuesWeek);
visitPlanEmployeeWeekID = newWeekId;
}
}
var rowData = vars.get("$local.rowdata");
//logging.log("rowData: " + rowData["VISITRECOMMENDATION_ID.value"]);
//logging.log("field: " +vars.get("$field.VISITRECOMMENDATION_ID"));
var valuesEntry = [
rowData["UID.value"],
rowData["ENTRYDATE.value"],
rowData["BEGIN_TIME.value"],
rowData["END_TIME.value"],
rowData["ORGANISATION_CONTACT_ID.value"],
rowData["CONTACT_ID.value"],
if(vars.get("$param.NoVisitPlanEmployeeWeek_param")){
var valuesEntry = [
util.getNewUUID(),
vars.get("$field.ENTRYDATE"),
vars.get("$field.BEGIN_TIME"),
vars.get("$field.END_TIME"),
vars.get("$field.ORGANISATION_CONTACT_ID"),
vars.get("$field.CONTACT_ID"),
visitPlanEmployeeWeekID,
rowData["STATUS.value"],
rowData["STATUS_APPOINTMENT.value"],
rowData["VISITRECOMMENDATION_ID.value"] || ""
];
vars.get("$field.STATUS"),
vars.get("$field.STATUS_APPOINTMENT"),
vars.get("$field.VISITRECOMMENDATION_ID"),
];
var columnsEntry = [
var columnsEntry = [
"VISITPLANENTRYID",
"ENTRYDATE",
"BEGIN_TIME",
......@@ -76,8 +73,7 @@ var columnsEntry = [
"STATUS",
"STATUS_APPOINTMENT",
"VISITRECOMMENDATION_ID"
];
];
insertData.push(["VISITPLANENTRY", columnsEntry, null, valuesEntry])
db.inserts(insertData);
db.insertData("VISITPLANENTRY", columnsEntry, null, valuesEntry);
}
\ No newline at end of file
entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js → entity/VisitPlanEntry_entity/recordcontainers/db/onDBUpdate.js
+ 3
− 28
View file @ c9767aed
......@@ -2,15 +2,14 @@ import("Employee_lib");
import("system.util");
import("system.datetime");
import("Sql_lib");
import("system.logging");
import("system.neon");
import("system.db");
import("system.vars");
var rowData = vars.get("$local.rowdata");
var user = EmployeeUtils.getCurrentContactId()
var calendarWeek = datetime.toLocaleDate(rowData["ENTRYDATE.value"], "w");
var calendarYear = datetime.toLocaleDate(rowData["ENTRYDATE.value"], "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)
......@@ -41,28 +40,4 @@ else
db.insertData("VISITPLANEMPLOYEEWEEK", columnsWeek, null, valuesWeek);
visitPlanEmployeeWeekID = newWeekId;
}
var values = [
rowData["ENTRYDATE.value"],
rowData["BEGIN_TIME.value"],
rowData["END_TIME.value"],
rowData["ORGANISATION_CONTACT_ID.value"],
rowData["STATUS.value"],
rowData["STATUS_APPOINTMENT.value"],
visitPlanEmployeeWeekID
];
var columns = [
"ENTRYDATE",
"BEGIN_TIME",
"END_TIME",
"ORGANISATION_CONTACT_ID",
"STATUS",
"STATUS_APPOINTMENT",
"VISITPLANEMPLOYEEWEEK_ID"
];
var cond = newWhere("VISITPLANENTRY.VISITPLANENTRYID", vars.get("$field.UID")).toString();
db.updateData("VISITPLANENTRY", columns, null, values, cond);
}
\ 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