admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#35297 mld_melding_onderwerp

Browse Source 
svn path=/Website/trunk/; revision=28231
This commit is contained in:
Peter Feij
2016-02-20 10:44:10 +00:00
parent 913d80e4c8
commit 0dd58d17f1
5 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/MLD/mld.inc
View File

@@ -1197,6 +1197,7 @@ mld = {setmeldingstatus:
if (searchtekst)
{
sqln += " AND (UPPER(mld_melding_omschrijving) LIKE " + safe.quoted_sql_wild("%" + searchtekst + "%")
+ " OR UPPER(mld_melding_onderwerp) LIKE " + safe.quoted_sql_wild("%" + searchtekst + "%")
+ " OR UPPER(mld_melding_opmerking) LIKE " + safe.quoted_sql_wild("%" + searchtekst + "%")
+ " OR EXISTS (SELECT mld_melding_key"
+ " FROM mld_kenmerkmelding km"
@@ -1505,6 +1506,7 @@ mld = {setmeldingstatus:
// INITIALISATIE MET DE INITIEEL WEER TE GEVEN GEGEVENS
sql = "SELECT mld_melding_omschrijving"
+ " , mld_melding_onderwerp"
+ " , mld_melding_datum"
+ " , s.mld_ins_discipline_key"
+ " , m.mld_stdmelding_key"
@@ -1618,6 +1620,7 @@ mld = {setmeldingstatus:
var result = { mld_key: mld_key,
mld_omschr: oRs("mld_melding_omschrijving").Value,
mld_onderwerp: oRs("mld_melding_onderwerp").Value,
melddatum: new Date( oRs("mld_melding_datum").Value),
disc: oRs("mld_ins_discipline_key").Value,
stdm: oRs("mld_stdmelding_key").Value,

7
APPL/MLD/mld_edit_melding.asp
View File

@@ -1010,6 +1010,13 @@ lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
: ''),
true,
mld_melding.freetext == 0); // Geen omschrijving indien mld_stdmelding_freetext == 0
// Short subject
RWFIELDTR("melding_onderwerp",
"fld" + ((mld_melding.freetext == 2 && (this_mld.canOmsChange || mld_key < 0) && !txtreado)? " required" : ""),
L("lcl_mld_subject"),
mld_melding.mld_onderwerp,
{html: (!(this_mld.canOmsChange || mld_key < 0) || txtreado? " readonly" : "")});
// Complaint text description
RWTEXTAREATR("melding_omschrijving",
"fldtxt" + ((mld_melding.freetext == 2 && (this_mld.canOmsChange || mld_key < 0) && !txtreado)? " required" : ""),

3
APPL/MLD/mld_edit_melding_save.asp
View File

@@ -234,7 +234,8 @@ if (savemode)
}
// Deze velden altijd opslaan
var fields = [ { dbs: "mld_melding_omschrijving", typ: "varchar", frm: "melding_omschrijving", track: L("lcl_mld_inf_Omschrijving"), len: 4000 },
var fields = [ { dbs: "mld_melding_onderwerp", typ: "varchar", frm: "melding_onderwerp", track: L("lcl_mld_subject"), len: 60 },
{ dbs: "mld_melding_omschrijving", typ: "varchar", frm: "melding_omschrijving", track: L("lcl_mld_inf_Omschrijving"), len: 4000 },
{ dbs: "mld_kosten_klant", typ: "check", frm: "kostenklant" /* notrack: */ },
{ dbs: "mld_melding_ordernr", typ: "varchar", frm: "ordernr", track: L("lcl_mld_inf_Ordernr")},
{ dbs: "prs_perslid_key", typ: "key", frm: "person", track: L("lcl_mld_name"), foreign: "prs_perslid" },

14
APPL/MLD/mld_list.inc
View File

@@ -128,6 +128,13 @@ function mld_list (pautfunction, params)
var behandel_key = params.behandel_key;
var disc_key_arr = params.disc_key_arr;
var offertes = params.offertes;
// Fast check to see if we have anything to do with geographics
// If not, we can suppress a few filters.
sql= "SELECT 1 FROM ins_srtdiscipline WHERE (ins_srtdiscipline_alg=1 OR ins_srtdiscipline_ins=1 OR ins_srtdiscipline_bes=1) AND ROWNUM = 1";
oRs = Oracle.Execute(sql);
var anygeo = !oRs.eof;
oRs.close();
%>
<html>
<head>
@@ -146,6 +153,7 @@ function mld_list (pautfunction, params)
sqln = "SELECT "
+ " m.mld_melding_key"
+ ", mld_melding_datum"
+ ", m.mld_melding_onderwerp"
+ ", m.mld_melding_omschrijving"
+ ", m.prs_kostenplaats_key"
+ ", m.mld_melding_opmerking"
@@ -448,6 +456,7 @@ function mld_list (pautfunction, params)
// Hier niet de functie mld.mld_melding_info(mldkey) gebruiken om mld_melding informatie op te halen.
// Een groot gedeelte van de mld_melding informatie heb ik trouwens al.
var mld_melding = {mld_key: mldkey,
mld_onderwerp: oRs("mld_melding_onderwerp").Value,
mld_omschr: oRs("mld_melding_omschrijving").Value,
kostenpl_key: oRs("prs_kostenplaats_key").Value || -1,
alg_onrgoed_niveau: oRs("alg_onrgoed_niveau").Value,
@@ -778,7 +787,10 @@ function mld_list (pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_time"), combine: true, content: "mld_melding_datum", datatype: "time", nowrap: true, nomidnight: true}));
if (minfo)
rst.addColumn(new Column({caption: L("lcl_district"), content: "alg_district_omschrijving", purpose: PRINTING_ONLY}));
rst.addColumn(new Column({caption: L("lcl_place"), content: "plaatsmelding"}));
if (anygeo) {
rst.addColumn(new Column({caption: L("lcl_place"), content: "plaatsmelding"}));
}
rst.addColumn(new Column({caption: L("lcl_mld_subject"), content: "mld_melding_onderwerp"}));
if (S("mld_print_loc_address") == 1)
rst.addColumn(new Column({caption: L("lcl_location_address"), content: "alg_locatie_adres", purpose: PRINTING_ONLY}));
if (minfo)

4
APPL/MLD/mld_show_melding.asp
View File

@@ -61,7 +61,7 @@ if (mld_melding.locked_user_key == user_key)
mld.unlock(mld_key);
lcl.set_dialect(mld_melding.srtdisc, "MLD_SRTDISCIPLINE_KEY");
var subjectMail = L("lcl_mld_complain_subject").format((mld_melding.prefix||"")+mld_key, mld_melding.mld_stdmelding_omschrijving, mld_melding.ins_discipline_omschrijving);
var subjectMail = L("lcl_mld_complain_subject").format((mld_melding.prefix||"")+mld_key, mld_melding.mld_stdmelding_omschrijving, mld_melding.ins_discipline_omschrijving, mld_melding.mld_onderwerp);
var urlMail = "../shared/queuemail.asp?pcode=MLDMAI&defemail_key=" + mld_melding.melder_key
+ "&key=" + mld_key
+ "&subject=" + Server.URLencode(subjectMail)
@@ -387,7 +387,7 @@ function parentButton()
%></div><% // div.leftcontainer, de rest staat rechts
BLOCK_START("mldInfo", L("lcl_complain") + " "+ (mld_melding.prefix != null? mld_melding.prefix : "") + mld_key);
BLOCK_START("mldInfo", L("lcl_complain") + " "+ (mld_melding.prefix != null? mld_melding.prefix : "") + mld_key + (mld_melding.mld_onderwerp ? ": <span class='mldsubject'>" + mld_melding.mld_onderwerp + "</span>" : ""));
if (!mld_melding.show_start_date) { // alleen dan is de melddatum de invoerdatum; in het andere geval staat-ie elders al
ROFIELDTR("flddatetime", L("lcl_mld_date_time"), toDateTimeString(mld_melding.melddatum));
}