Skip to content
Snippets Groups Projects
Commit 5bafee24 authored by c.wimmer's avatar c.wimmer
Browse files

[Projekt: xRM-Sales][TicketNr.: 1062226][Meine Besuchsplanung Dashlet fehlerhaft]

parent 5f7ae020
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,7 @@ var items = []; ...@@ -16,7 +16,7 @@ var items = [];
var group = []; var group = [];
var entryData = ""; var entryData = "";
var entrySQL = newSelect("ENTRYDATE, VISITPLANENTRYID, BEGIN_TIME, END_TIME, ORGANISATION_CONTACT_ID, CONTACT_ID,STATUS, VISITPLANEMPLOYEEWEEK_ID" var entrySQL = newSelect("ENTRYDATE, VISITPLANENTRYID, BEGIN_TIME, END_TIME, ORGANISATION_CONTACT_ID, VISITPLANENTRY.CONTACT_ID, STATUS, VISITPLANEMPLOYEEWEEK_ID"
+", APPOINTMENT_ID, STATUS_APPOINTMENT, VISITRECOMMENDATION_ID") +", APPOINTMENT_ID, STATUS_APPOINTMENT, VISITRECOMMENDATION_ID")
.from("VISITPLANENTRY"); .from("VISITPLANENTRY");
...@@ -41,6 +41,7 @@ else if(vars.exists("$param.EntriesofCurrentWeek_param") && vars.get("$param.Ent ...@@ -41,6 +41,7 @@ else if(vars.exists("$param.EntriesofCurrentWeek_param") && vars.get("$param.Ent
} }
entrySQL.orderBy("ENTRYDATE, BEGIN_TIME"); entrySQL.orderBy("ENTRYDATE, BEGIN_TIME");
entryData = entrySQL.table(); entryData = entrySQL.table();
if(entryData.length > 0) if(entryData.length > 0)
......
import("Sql_lib"); import("Sql_lib");
import("system.datetime"); import("system.datetime");
import("system.translate"); import("system.translate");
import("system.logging");
import("system.vars"); import("system.vars");
import("system.db"); import("system.db");
import("system.result"); import("system.result");
var group = []; var group = [];
var entryData = ""; var entryData = "";
var entrySQL = "";
var count = 0; var count = 0;
if(vars.exists("$param.Entries_param")) var entrySQL = newSelect("ENTRYDATE").from("VISITPLANENTRY");
if(vars.exists("$param.Entries_param") && vars.get("$param.Entries_param"))
{ {
entrySQL = newSelect("ENTRYDATE") entrySQL = newSelect("ENTRYDATE")
.from("VISITPLANENTRY") .from("VISITPLANENTRY")
...@@ -19,9 +19,9 @@ if(vars.exists("$param.Entries_param")) ...@@ -19,9 +19,9 @@ if(vars.exists("$param.Entries_param"))
} }
if (vars.exists("$local.idvalues") && vars.get("$local.idvalues")) if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
{ {
entrySQL.andIfSet("VISITPLANENTRYID", vars.get("$local.idvalues")); entrySQL.andIfSet("VISITPLANENTRY.VISITPLANENTRYID", vars.get("$local.idvalues"));
} }
entrySQL.orderBy("ENTRYDATE, BEGIN_TIME "); entrySQL.orderBy("VISITPLANENTRY.ENTRYDATE, VISITPLANENTRY.BEGIN_TIME");
entryData = entrySQL.table(); entryData = entrySQL.table();
count += entryData.length; count += entryData.length;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment