From bfc381d54ed22c1553371da0925c01bb307f0742 Mon Sep 17 00:00:00 2001 From: Erik Groener Date: Fri, 24 Feb 2017 12:49:19 +0000 Subject: [PATCH] FSN#39312 Verder ontsluiten van modellen via de API svn path=/Website/trunk/; revision=32944 --- APPL/API2/api2_dispatch.inc | 146 ++++++++++++++------------ APPL/API2/model_fac_export_app.inc | 6 +- APPL/API2/model_fac_groeprechten.inc | 69 ++++++------ APPL/API2/model_fac_idp.inc | 10 +- APPL/API2/model_fac_import_app.inc | 8 +- APPL/API2/model_fac_profielwaarde.inc | 11 +- APPL/API2/model_fac_usergraph.inc | 10 +- APPL/API2/model_fac_usrdata.inc | 10 +- APPL/API2/model_fac_usrtab.inc | 10 +- APPL/API2/model_fac_widget.inc | 16 +-- APPL/MGT/fac_groeprechten.asp | 16 +-- APPL/MGT/fac_idp.asp | 2 +- APPL/MGT/fac_import_app.asp | 4 +- APPL/MGT/fac_import_app.js | 4 +- APPL/MGT/fac_profielwaarde.asp | 2 +- APPL/MGT/fac_srtnotificatie.asp | 31 ++---- APPL/MGT/fac_usergraph.asp | 8 +- APPL/MGT/fac_widget.asp | 12 +-- 18 files changed, 184 insertions(+), 191 deletions(-) diff --git a/APPL/API2/api2_dispatch.inc b/APPL/API2/api2_dispatch.inc index 2d31eb3e7c..088db9b086 100644 --- a/APPL/API2/api2_dispatch.inc +++ b/APPL/API2/api2_dispatch.inc @@ -13,96 +13,108 @@ var api2_mapper = { // De 'name' moet hier gelijk zijn aan model.records_name // en die moet zo nodig eerst nog fatsoenlijk engelstalig gemaakt worden - "realestateproperties" : "appl/mgt/alg_kenmerk.asp", - "buildingfunctions" : "appl/mgt/alg_srtgebouw.asp", - "terrainfunctions" : "appl/mgt/alg_srtterreinsector.asp", - "orderdisciplines" : "appl/mgt/bes_discipline.asp", // F - "ordercatalogues" : "appl/mgt/bes_disciplineprod.asp", - "unit" : "appl/mgt/bes_grootheid.asp", - "orderlineproperties" : "appl/mgt/bes_kenmerk.asp", // F - "orderproperties" : "appl/mgt/bes_kenmerkbestel.asp", // F - "xxxxxx" : "appl/mgt/bes_srtgroep.asp", - "xxxxxx" : "appl/mgt/bes_srtkenmerk.asp", - "xxxxxx" : "appl/mgt/bes_srtprodgroep.asp", - "xxxxxx" : "appl/mgt/bes_staffeltabel.asp", - "visitoractions" : "appl/mgt/bez_actie.asp", - "xxxxxx" : "appl/mgt/bez_kenmerk.asp", - "xxxxxx" : "appl/mgt/cad_label.asp", - "xxxxxx" : "appl/mgt/cad_legenda.asp", - "xxxxxx" : "appl/mgt/cad_legendawaarde.asp", - "xxxxxx" : "appl/mgt/cad_thema.asp", - "xxxxxx" : "appl/mgt/cnt_discipline.asp", - "xxxxxx" : "appl/mgt/cnt_kenmerk.asp", - "xxxxxx" : "appl/mgt/cnt_srtkenmerk.asp", - "xxxxxx" : "appl/mgt/cnt_termijn.asp", - "taskcategories" : "appl/mgt/ctr_discipline.asp", - "xxxxxx" : "appl/mgt/fac_audit.asp", - "xxxxxx" : "appl/mgt/fac_edit_groeprechten.asp", - "xxxxxx" : "appl/mgt/fac_edit_groeprechten_save.asp", - "emailsettings" : "appl/mgt/fac_email_setting.asp", - "xxxxxx" : "appl/mgt/fac_export_app.asp", - "xxxxxx" : "appl/mgt/fac_functie.asp", - "authorisationgroups" : "appl/mgt/fac_groep.asp", - "xxxxxx" : "appl/mgt/fac_groeprechten.asp", - "xxxxxx" : "appl/mgt/fac_idp.asp", - "xxxxxx" : "appl/mgt/fac_import_app.asp", - "notificationjobs" : "appl/mgt/fac_notificatiejob.asp", - "profiles" : "appl/mgt/fac_profiel.asp", - "xxxxxx" : "appl/mgt/fac_profielwaarde.asp", - "xxxxxx" : "appl/mgt/fac_srtnotificatie.asp", - "xxxxxx" : "appl/mgt/fac_usergraph.asp", - "xxxxxx" : "appl/mgt/fac_usrtab.asp", - "xxxxxx" : "appl/mgt/fac_widget.asp", - "xxxxxx" : "appl/mgt/faq_kenmerk.asp", - "xxxxxx" : "appl/mgt/fin_btwtabel.asp", - "xxxxxx" : "appl/mgt/fin_kenmerk.asp", - "xxxxxx" : "appl/mgt/fin_verkoopfactuur.asp", + "realestateproperties" : "appl/mgt/alg_kenmerk.asp", + "buildingfunctions" : "appl/mgt/alg_srtgebouw.asp", + "terrainfunctions" : "appl/mgt/alg_srtterreinsector.asp", + "orderdisciplines" : "appl/mgt/bes_discipline.asp", + "ordercatalogues" : "appl/mgt/bes_disciplineprod.asp", + "orderunits" : "appl/mgt/bes_grootheid.asp", + "orderlineproperties" : "appl/mgt/bes_kenmerk.asp", + "orderproperties" : "appl/mgt/bes_kenmerkbestel.asp", + "orderarticlegroups" : "appl/mgt/bes_srtgroep.asp", + "orderpropertytypes" : "appl/mgt/bes_srtkenmerk.asp", + "orderproductgroups" : "appl/mgt/bes_srtprodgroep.asp", + "pacelisttables" : "appl/mgt/bes_staffeltabel.asp", + "visitoractions" : "appl/mgt/bez_actie.asp", + "visitorproperties" : "appl/mgt/bez_kenmerk.asp", + + "graphiclabels" : "appl/mgt/cad_label.asp", + "graphiclegendas" : "appl/mgt/cad_legenda.asp", + "graphiclegendavalues" : "appl/mgt/cad_legendawaarde.asp", + "graphicthemes" : "appl/mgt/cad_thema.asp", + + "contractdisciplines" : "appl/mgt/cnt_discipline.asp", + "contractproperties" : "appl/mgt/cnt_kenmerk.asp", + "contractpropertytypes" : "appl/mgt/cnt_srtkenmerk.asp", + "contractperiods" : "appl/mgt/cnt_termijn.asp", + "taskcategories" : "appl/mgt/ctr_discipline.asp", + + "audits" : "appl/mgt/fac_audit.asp", + "xxxxxx" : "appl/mgt/fac_edit_groeprechten.asp", //? + "xxxxxx" : "appl/mgt/fac_edit_groeprechten_save.asp", //? + "emailsettings" : "appl/mgt/fac_email_setting.asp", + "exportfunctions" : "appl/mgt/fac_export_app.asp", + "authorizationfunctions" : "appl/mgt/fac_functie.asp", + "authorizationgroups" : "appl/mgt/fac_groep.asp", + "authorizations" : "appl/mgt/fac_groeprechten.asp", + "identityproviders" : "appl/mgt/fac_idp.asp", + "importfunctions" : "appl/mgt/fac_import_app.asp", + "notificationjobs" : "appl/mgt/fac_notificatiejob.asp", + "profiles" : "appl/mgt/fac_profiel.asp", + "profilevalues" : "appl/mgt/fac_profielwaarde.asp", + "notificationtypes" : "appl/mgt/fac_srtnotificatie.asp", + "customgraphs" : "appl/mgt/fac_usergraph.asp", + "customtables" : "appl/mgt/fac_usrtab.asp", + "widgets" : "appl/mgt/fac_widget.asp", + "knowledgeproperties" : "appl/mgt/faq_kenmerk.asp", + "vattables" : "appl/mgt/fin_btwtabel.asp", + "invoiceproperties" : "appl/mgt/fin_kenmerk.asp", + + "xxxxxx" : "appl/mgt/fin_verkoopfactuur.asp", // klant specifiek ?? + "xxxxxx" : "appl/mgt/generic_prs_perslid.asp", - "xxxxxx" : "appl/mgt/ins_controlemode.asp", + + "taskhandlings" : "appl/mgt/ins_controlemode.asp", "xxxxxx" : "appl/mgt/ins_discipline.asp", - "xxxxxx" : "appl/mgt/ins_kenmerk.asp", + "objectproperties" : "appl/mgt/ins_kenmerk.asp", "xxxxxx" : "appl/mgt/ins_srtcontrole.asp", "xxxxxx" : "appl/mgt/ins_srtgroep.asp", - "xxxxxx" : "appl/mgt/ins_srtkenmerk.asp", + "objectpropertytypes" : "appl/mgt/ins_srtkenmerk.asp", "xxxxxx" : "appl/mgt/ins_tab_discipline.asp", + "xxxxxx" : "appl/mgt/mgt_generic.asp", + "xxxxxx" : "appl/mgt/mld_afmeldtekst.asp", - "xxxxxx" : "appl/mgt/mld_behandelgroep.asp", - "xxxxxx" : "appl/mgt/mld_dienstniveau.asp", + "backofficegroups" : "appl/mgt/mld_behandelgroep.asp", + "servicelevels" : "appl/mgt/mld_dienstniveau.asp", "issuedisciplines" : "appl/mgt/mld_discipline.asp", - "xxxxxx" : "appl/mgt/mld_impropdr.asp", - "xxxxxx" : "appl/mgt/mld_kenmerk.asp", - "expenses" : "appl/mgt/mld_kosten.asp", - "callsources" : "appl/mgt/mld_meldbron.asp", - "xxxxxx" : "appl/mgt/mld_srtdiscipline.asp", - "xxxxxx" : "appl/mgt/mld_srtkenmerk.asp", - "xxxxxx" : "appl/mgt/mld_stdmelding_groep.asp", + "unproductivetimes" : "appl/mgt/mld_impropdr.asp", + "issueproperties" : "appl/mgt/mld_kenmerk.asp", + "expenses" : "appl/mgt/mld_kosten.asp", + "callsources" : "appl/mgt/mld_meldbron.asp", + "disciplinetypes" : "appl/mgt/mld_srtdiscipline.asp", + "issuepropertytypes" : "appl/mgt/mld_srtkenmerk.asp", + "callgroups" : "appl/mgt/mld_stdmelding_groep.asp", "xxxxxx" : "appl/mgt/mld_typeopdr.asp", - "daysoff" : "appl/mgt/mld_vrije_dagen.asp", + "daysoff" : "appl/mgt/mld_vrije_dagen.asp", "xxxxxx" : "appl/mgt/mld_workflow.asp", "xxxxxx" : "appl/mgt/mld_workflowstep.asp", "xxxxxx" : "appl/mgt/mld_workflow_expression.asp", - "xxxxxx" : "appl/mgt/mrk_discipline.asp", - "xxxxxx" : "appl/mgt/prs_dienst.asp", - "xxxxxx" : "appl/mgt/prs_kenmerk.asp", + + "pinboardcategories" : "appl/mgt/mrk_discipline.asp", + + "services" : "appl/mgt/prs_dienst.asp", + "basisproperties" : "appl/mgt/prs_kenmerk.asp", "xxxxxx" : "appl/mgt/prs_kostencombinatie.asp", "xxxxxx" : "appl/mgt/prs_kostensoort.asp", "xxxxxx" : "appl/mgt/prs_kostensoortgrp.asp", "xxxxxx" : "appl/mgt/prs_perslid.asp", - "xxxxxx" : "appl/mgt/prs_relatietype.asp", - "functions" : "appl/mgt/prs_srtperslid.asp", + "relationtypes" : "appl/mgt/prs_relatietype.asp", + "employeefunctions" : "appl/mgt/prs_srtperslid.asp", "xxxxxx" : "appl/mgt/prs_staffel.asp", + "xxxxxx" : "appl/mgt/res_activiteit.asp", "xxxxxx" : "appl/mgt/res_artikel.asp", - "xxxxxx" : "appl/mgt/res_cyclus.asp", + "reservationcycles" : "appl/mgt/res_cyclus.asp", "xxxxxx" : "appl/mgt/res_deel.asp", "xxxxxx" : "appl/mgt/res_discipline.asp", - "xxxxxx" : "appl/mgt/res_kenmerk.asp", - "xxxxxx" : "appl/mgt/res_opstelling.asp", + "bookingproperties" : "appl/mgt/res_kenmerk.asp", + "roomconfigurations" : "appl/mgt/res_opstelling.asp", "xxxxxx" : "appl/mgt/res_ruimte.asp", - "xxxxxx" : "appl/mgt/res_srtactiviteit.asp", + "activitytypes" : "appl/mgt/res_srtactiviteit.asp", "articlescopes" : "appl/mgt/res_srtartikel_onrgoed.asp", - "xxxxxx" : "appl/mgt/res_srtkenmerk.asp", + "bookingpropertytypes" : "appl/mgt/res_srtkenmerk.asp", + "xxxxxx" : "appl/mgt/user_tables.asp", "xxxxxx" : "appl/mgt/workflow_graph.asp", "xxxxxx" : "appl/mgt/workflow_graph_png.asp", diff --git a/APPL/API2/model_fac_export_app.inc b/APPL/API2/model_fac_export_app.inc index c1924f910c..c0594bce5e 100644 --- a/APPL/API2/model_fac_export_app.inc +++ b/APPL/API2/model_fac_export_app.inc @@ -15,10 +15,10 @@ function model_fac_export_app() { + this.records_name = "exportfunctions"; + this.record_name = "exportfunction"; this.table = "fac_export_app"; this.primary = "fac_export_app_key"; - this.records_name = "fac_export_apps"; - this.record_name = "fac_export_app"; this.autfunction = "WEB_PRSSYS"; this.record_title = L("fac_export_app"); this.records_title = L("fac_export_app_m"); @@ -27,7 +27,7 @@ function model_fac_export_app() this.fields = { "id": { "dbs": "fac_export_app_key", - "label": "Key", + "label": L("lcl_key"), "typ": "key", "required": true, "filter": "exact", diff --git a/APPL/API2/model_fac_groeprechten.inc b/APPL/API2/model_fac_groeprechten.inc index b4390ffc08..3950e14436 100644 --- a/APPL/API2/model_fac_groeprechten.inc +++ b/APPL/API2/model_fac_groeprechten.inc @@ -34,11 +34,10 @@ function model_fac_groeprechten (params) else INTERNAL_ERROR_GROEPRECHTEN; // minstens 1 van de drie moet er zijn + this.records_name = "authorizations"; + this.record_name = "authorisation"; this.table = "fac_groeprechten"; this.primary = "fac_groeprechten_key"; - this.records_name = "fac_groeprecht"; - this.record_name = "fac_groeprechten"; - this.autfunction = "WEB_FACMSU"; this.record_title = L("fac_groeprechten"); this.records_title = L("fac_groeprechten_m"); @@ -46,14 +45,14 @@ function model_fac_groeprechten (params) this.fields = { "id": { "dbs": "fac_groeprechten_key", - "label": "Key", + "label": L("lcl_key"), "typ": "key", "hidden_fld": true, "required": true, "filter": "exact", "seq": "fac_s_fac_groeprechten_key" }, - "fac_groep": { + "authorizationgroup": { "dbs": "fac_groep_key", "label": L("fac_groep"), "typ": "key", @@ -64,14 +63,14 @@ function model_fac_groeprechten (params) "desc": "fac_groep_omschrijving" } }, - "fac_functie": { + "authorization": { "dbs": "fac_functie_key", "label": L("fac_functie_key"), "typ": "key", "hidden_fld": true, "foreign": "fac_functie" }, - "ins_discipline": { + "discipline": { "dbs": "ins_discipline_key", "label": L("mgt_discipline"), "typ": "key", @@ -83,25 +82,25 @@ function model_fac_groeprechten (params) "where": "ins_discipline_verwijder IS NULL" } }, - "prs_level_read": { + "basislevelread": { "dbs": "fac_gebruiker_prs_level_read", "label": L("fac_gebruiker_prs_level_read"), "typ": "number", "foreign": foreignPRSRechten }, - "prs_level_write": { + "basislevelwrite": { "dbs": "fac_gebruiker_prs_level_write", "label": L("fac_gebruiker_prs_level_write"), "typ": "number", "foreign": foreignPRSRechten }, - "alg_level_read": { + "realestatelevelread": { "dbs": "fac_gebruiker_alg_level_read", "label": L("fac_gebruiker_alg_level_read"), "typ": "number", "foreign": foreignALGRechten }, - "alg_level_write": { + "realestatelevelwrite": { "dbs": "fac_gebruiker_alg_level_write", "label": L("fac_gebruiker_alg_level_write"), "typ": "number", @@ -185,8 +184,8 @@ function model_fac_groeprechten (params) oRs.Close(); if (!(this.min_level & (4 | 8))) { - this.fields["prs_level_read"].label = L("fac_gebruiker_lezen"); // Generiekere labels - this.fields["prs_level_write"].label = L("fac_gebruiker_schrijven"); + this.fields["basislevelread"].label = L("fac_gebruiker_lezen"); // Generiekere labels + this.fields["basislevelwrite"].label = L("fac_gebruiker_schrijven"); } } @@ -220,12 +219,12 @@ function model_fac_groeprechten (params) + " WHERE fac_functie_key = " + params.functie_key + " GROUP BY fac_groep_key, fac_functie_key) fac_groeprechten"; this.record_title += " TODO Functie: " + params.functie_key; - this.fields["prs_level_read"].val = fnRechten; - this.fields["prs_level_write"].val = fnRechten; - this.fields["alg_level_read"].val = fnRechten; - this.fields["alg_level_write"].val = fnRechten; + this.fields["basislevelread"].val = fnRechten; + this.fields["basislevelwrite"].val = fnRechten; + this.fields["realestatelevelread"].val = fnRechten; + this.fields["realestatelevelwrite"].val = fnRechten; - this.fields["ins_discipline"] = + this.fields["discipline"] = { "dbs": "nn_disc", "label": L("mgt_discipline"), @@ -258,11 +257,11 @@ function model_fac_groeprechten (params) + " AND g.fac_functie_key = f.fac_functie_key" + " GROUP BY fac_groep_key, g.fac_functie_key, fac_functie_discipline, fac_functie_min_level, fac_functie_module) fac_groeprechten"; this.record_title += " TODO Groep: " + params.groep_key; - this.fields["prs_level_read"].val = fnRechten; - this.fields["prs_level_write"].val = fnRechten; - this.fields["alg_level_read"].val = fnRechten; - this.fields["alg_level_write"].val = fnRechten; - this.fields["ins_discipline"] = + this.fields["basislevelread"].val = fnRechten; + this.fields["basislevelwrite"].val = fnRechten; + this.fields["realestatelevelread"].val = fnRechten; + this.fields["realestatelevelwrite"].val = fnRechten; + this.fields["discipline"] = { "dbs": "nn_disc", "label": L("mgt_discipline"), @@ -284,11 +283,11 @@ function model_fac_groeprechten (params) + " WHERE ins_discipline_key = " + params.disc_key + " GROUP BY ins_discipline_key, fac_functie_key) fac_groeprechten"; this.record_title += " TODO Disc: " + params.groep_key; - this.fields["prs_level_read"].val = fnRechten; - this.fields["prs_level_write"].val = fnRechten; - this.fields["alg_level_read"].val = fnRechten; - this.fields["alg_level_write"].val = fnRechten; - this.fields["fac_groep"] = + this.fields["basislevelread"].val = fnRechten; + this.fields["basislevelwrite"].val = fnRechten; + this.fields["realestatelevelread"].val = fnRechten; + this.fields["realestatelevelwrite"].val = fnRechten; + this.fields["authorizationgroup"] = { "dbs": "nn_groep", "label": L("fac_groep_m"), @@ -301,13 +300,13 @@ function model_fac_groeprechten (params) this.list = { "columns": [ "id", - "fac_functie", - "fac_groep", - "ins_discipline", - "prs_level_read", - "prs_level_write", - "alg_level_read", - "alg_level_write" + "authorization", + "authorizationgroup", + "discipline", + "basislevelread", + "basislevelwrite", + "realestatelevelread", + "realestatelevelwrite" ] }; diff --git a/APPL/API2/model_fac_idp.inc b/APPL/API2/model_fac_idp.inc index 3d4a0121da..d50c839015 100644 --- a/APPL/API2/model_fac_idp.inc +++ b/APPL/API2/model_fac_idp.inc @@ -9,10 +9,10 @@ function fac_idp() { + this.records_name = "identityproviders"; + this.record_name = "identityprovider"; this.table = "fac_idp"; this.primary = "fac_idp_key"; - this.records_name = "idps"; - this.record_name = "idp"; this.autfunction = "WEB_FACFAC"; this.record_title = L("fac_idp"); this.records_title = L("fac_idp_m"); @@ -20,7 +20,7 @@ function fac_idp() this.fields = { "id": { "dbs": "fac_idp_key", - "label": "Key", + "label": L("lcl_key"), "typ": "key", "seq": "fac_s_fac_idp_key" }, @@ -81,12 +81,12 @@ function fac_idp() "label": L("fac_idp_duration"), "typ": "number" }, - "remote_loginurl": { + "remoteloginurl": { "dbs": "fac_idp_remote_loginurl", "label": L("fac_idp_remote_loginurl"), "typ": "varchar" }, - "remote_logouturl": { + "remotelogouturl": { "dbs": "fac_idp_remote_logouturl", "label": L("fac_idp_remote_logouturl"), "typ": "varchar" diff --git a/APPL/API2/model_fac_import_app.inc b/APPL/API2/model_fac_import_app.inc index 0207eccd19..18f3685c4c 100644 --- a/APPL/API2/model_fac_import_app.inc +++ b/APPL/API2/model_fac_import_app.inc @@ -15,10 +15,10 @@ function model_fac_import_app() { + this.records_name = "importfunctions"; + this.record_name = "importfunction"; this.table = "fac_import_app"; this.primary = "fac_import_app_key"; - this.records_name = "fac_import_apps"; - this.record_name = "fac_import_app"; this.autfunction = "WEB_PRSSYS"; //"WEB_BESMGT"; this.record_title = L("fac_import_app"); this.records_title = L("fac_import_app_m"); @@ -27,7 +27,7 @@ function model_fac_import_app() this.fields = { "id": { "dbs": "fac_import_app_key", - "label": "Key", + "label": L("lcl_key"), "typ": "key", "required": true, "filter": "exact", @@ -52,7 +52,7 @@ function model_fac_import_app() "foreign": "fac_functie", "filter": "exact" }, - "catalog": { + "orderdiscipline": { "dbs": "ins_discipline_key", "label": L("fac_ins_discipline_key"), "typ": "key", diff --git a/APPL/API2/model_fac_profielwaarde.inc b/APPL/API2/model_fac_profielwaarde.inc index 370ad33441..07d8230beb 100644 --- a/APPL/API2/model_fac_profielwaarde.inc +++ b/APPL/API2/model_fac_profielwaarde.inc @@ -15,10 +15,10 @@ function model_fac_profielwaarde() { + this.records_name = "profilevalues"; + this.record_name = "profilevalue"; this.table = "fac_profielwaarde"; this.primary = "fac_profielwaarde_key"; - this.records_name = "fac_profielwaardes"; - this.record_name = "fac_profielwaarde"; this.autfunction = "WEB_FINMSU"; this.record_title = L("fac_profielwaarde"); this.records_title = L("fac_profielwaarde_m"); @@ -40,7 +40,7 @@ function model_fac_profielwaarde() this.fields = { "id": { "dbs": "fac_profielwaarde_key", - "label": "Key", + "label": L("lcl_key"), "typ": "key", "required": true, "filter": "exact", @@ -77,7 +77,7 @@ function model_fac_profielwaarde() }, "friendlyname": true }, - "value_limit": { + "valuelimit": { "dbs": "fac_profielwaarde_limiet", "label": L("fac_profielwaarde_limiet"), "typ": "number", @@ -92,7 +92,7 @@ function model_fac_profielwaarde() "id", "prefix", "catalog", - "value_limit" + "valuelimit" ] }; this.search = { @@ -102,6 +102,7 @@ function model_fac_profielwaarde() "modal": true }; + var ext_sql = "("+catalogus_sql+") catalogus" this.REST_GET = generic_REST_GET(this, { "GET": { diff --git a/APPL/API2/model_fac_usergraph.inc b/APPL/API2/model_fac_usergraph.inc index f900b8b93a..25c16bab17 100644 --- a/APPL/API2/model_fac_usergraph.inc +++ b/APPL/API2/model_fac_usergraph.inc @@ -15,10 +15,10 @@ function model_fac_usergraph() { + this.records_name = "customgraphs"; + this.record_name = "customgraph"; this.table = "fac_usrgraph"; this.primary = "fac_usrgraph_key"; - this.records_name = "fac_usrgraphs"; - this.record_name = "fac_usrgraph"; this.autfunction = "WEB_PRSSYS"; this.record_title = L("fac_usrgraph"); this.records_title = L("fac_usrgraph_m"); @@ -27,7 +27,7 @@ function model_fac_usergraph() this.fields = { "id": { "dbs": "fac_usrgraph_key", - "label": "Key", + "label": L("lcl_key"), "typ": "key", "required": true, "filter": "exact", @@ -39,14 +39,14 @@ function model_fac_usergraph() "typ": "varchar", "translate": true }, - "view_name": { + "viewname": { "dbs": "fac_usrgraph_view_name", "label": L("fac_usrgraph_view_name"), "typ": "varchar", "required": true, "filter": "like" }, - "graph_type": { + "graphtype": { "dbs": "fac_usrgraph_type", "label": L("fac_usrgraph_type"), "typ": "key", diff --git a/APPL/API2/model_fac_usrdata.inc b/APPL/API2/model_fac_usrdata.inc index 7733e9b77f..3339411419 100644 --- a/APPL/API2/model_fac_usrdata.inc +++ b/APPL/API2/model_fac_usrdata.inc @@ -14,12 +14,12 @@ <% function model_fac_usrdata() { - var tab_key = getQParamInt("usertable", -1); + var tab_key = getQParamInt("customtable", -1); + this.records_name = "customtablevalues"; + this.record_name = "customtablevalue"; this.table = "fac_usrdata" this.primary = "fac_usrdata_key"; - this.records_name = "fac_usrdatas"; - this.record_name = "fac_usrdata"; this.soft_delete = "fac_usrdata_verwijder"; this.record_title = L("fac_usrdata"); this.records_title = L("fac_usrdata_m"); @@ -28,13 +28,13 @@ function model_fac_usrdata() this.fields = { "id": { "dbs": "fac_usrdata_key", - "label": "Key", + "label": L("lcl_key"), "typ": "key", "required": true, "filter": "exact", "seq": "fac_s_fac_usrdata_key" }, - "usertable": { + "customtable": { "dbs": "fac_usrtab_key", "label": L("fac_usrtab_naam"), "typ": "key", diff --git a/APPL/API2/model_fac_usrtab.inc b/APPL/API2/model_fac_usrtab.inc index 76bcbe88e8..065100456f 100644 --- a/APPL/API2/model_fac_usrtab.inc +++ b/APPL/API2/model_fac_usrtab.inc @@ -18,10 +18,10 @@ function model_fac_usrtab() { var tab_key = getQParamInt("fac_usrtab_key", -1); var params = params || {}; + this.records_name = "customtables"; + this.record_name = "customtable"; this.table = "fac_usrtab"; this.primary = "fac_usrtab_key"; - this.records_name = "fac_usrtabs"; - this.record_name = "fac_usrtab"; this.soft_delete = "fac_usrtab_verwijder"; this.autfunction = false; // we controleren het zelf this.record_title = L("fac_usrtab"); @@ -31,7 +31,7 @@ function model_fac_usrtab() this.fields = { "id": { "dbs": "fac_usrtab_key", - "label": "Key", + "label": L("lcl_key"), "typ": "key", "required": true, "filter": "exact", @@ -81,9 +81,9 @@ function model_fac_usrtab() this.show = {}; this.includes = { - "fac_usrdatas": { + "customtablevalues": { "model": new model_fac_usrdata(), - "joinfield": "usertable", + "joinfield": "customtable", "enable_update": true } }; diff --git a/APPL/API2/model_fac_widget.inc b/APPL/API2/model_fac_widget.inc index 8ed83913ba..de81a5ed7c 100644 --- a/APPL/API2/model_fac_widget.inc +++ b/APPL/API2/model_fac_widget.inc @@ -14,10 +14,10 @@ <% function model_fac_widget() { + this.records_name = "widgets"; + this.record_name = "widget"; this.table = "fac_widget"; this.primary = "fac_widget_key"; - this.records_name = "fac_widgets"; - this.record_name = "fac_widget"; this.autfunction = "WEB_PRSSYS"; this.record_title = L("fac_widget"); this.records_title = L("fac_widget_m") ; @@ -26,7 +26,7 @@ function model_fac_widget() this.fields = { "id": { "dbs": "fac_widget_key", - "label": "Key", + "label": L("lcl_key"), "typ": "key", "required": true, "filter": "exact", @@ -40,13 +40,13 @@ function model_fac_widget() "required": true, "filter": "like" }, - "link_url": { + "linkurl": { "dbs": "fac_widget_url", "label": L("fac_widget_url"), "typ": "varchar", "required": true }, - "widget_title": { + "title": { "dbs": "fac_widget_title", "label": L("fac_widget_title"), "translate": true, @@ -64,17 +64,17 @@ function model_fac_widget() "label": L("fac_widget_refreshtime"), "typ": "number" }, - "widget_id": { + "widgetid": { "dbs": "fac_widget_id", "label": L("fac_widget_id"), "typ": "varchar" }, - "widget_heigth": { + "widgetheigth": { "dbs": "fac_widget_height", "label": L("fac_widget_height"), "typ": "number" }, - "widget_width": { + "widgetwidth": { "dbs": "fac_widget_width", "label": L("fac_widget_width"), "typ": "number" diff --git a/APPL/MGT/fac_groeprechten.asp b/APPL/MGT/fac_groeprechten.asp index 875930fce7..b9814a0791 100644 --- a/APPL/MGT/fac_groeprechten.asp +++ b/APPL/MGT/fac_groeprechten.asp @@ -19,8 +19,8 @@ <% - var groep_key = getQParamInt("fac_groep"); - var functie_key = getQParamInt("fac_functie"); + var groep_key = getQParamInt("authorizationgroup"); + var functie_key = getQParamInt("authorization"); var model = new model_fac_groeprechten({ groep_key: groep_key, functie_key: functie_key }); var scf_params = @@ -34,11 +34,11 @@ "list": { "columns": [ "id", - "ins_discipline", - "prs_level_read", - "prs_level_write", - "alg_level_read", - "alg_level_write" + "discipline", + "basislevelread", + "basislevelwrite", + "realestatelevelread", + "realestatelevelwrite" ], "xxxorderby": [ "module", @@ -51,7 +51,7 @@ } }, "transit": { - "fac_groep": groep_key + "authorizationgroup": groep_key } }; diff --git a/APPL/MGT/fac_idp.asp b/APPL/MGT/fac_idp.asp index 4cb0a98ae3..59dffbd0a9 100644 --- a/APPL/MGT/fac_idp.asp +++ b/APPL/MGT/fac_idp.asp @@ -33,7 +33,7 @@ scaffolding(this_model, "code", "name", "type", - "remote_loginurl" + "remoteloginurl" ] }, "edit": { diff --git a/APPL/MGT/fac_import_app.asp b/APPL/MGT/fac_import_app.asp index 9372ef962a..4fb3ec40ce 100644 --- a/APPL/MGT/fac_import_app.asp +++ b/APPL/MGT/fac_import_app.asp @@ -21,7 +21,7 @@ scaffolding(this_model, "search": { "autosearch": true, "filters": [ - "catalog", + "orderdiscipline", "authorization", "company" ] @@ -30,7 +30,7 @@ scaffolding(this_model, "columns": [ "id", "code", - "catalog", + "orderdiscipline", "company", "name" ] diff --git a/APPL/MGT/fac_import_app.js b/APPL/MGT/fac_import_app.js index a48c86c4eb..05b6c5e425 100644 --- a/APPL/MGT/fac_import_app.js +++ b/APPL/MGT/fac_import_app.js @@ -2,8 +2,8 @@ function pre_submit() { var validation_message = ""; - var disc = $("#catalog_key").val(); - var bedr = $("#company_key").val(); + var disc = $("#orderdiscipline").val(); + var bedr = $("#company").val(); if (disc == -1 && bedr == -1) validation_message = L("fac_import_app_err1"); diff --git a/APPL/MGT/fac_profielwaarde.asp b/APPL/MGT/fac_profielwaarde.asp index 07843d3cf0..8903afb87f 100644 --- a/APPL/MGT/fac_profielwaarde.asp +++ b/APPL/MGT/fac_profielwaarde.asp @@ -31,7 +31,7 @@ scaffolding(this_model, "profile", "prefix", "catalog", - "value_limit" + "valuelimit" ] } }); diff --git a/APPL/MGT/fac_srtnotificatie.asp b/APPL/MGT/fac_srtnotificatie.asp index 7f331c816e..c83deb6d6a 100644 --- a/APPL/MGT/fac_srtnotificatie.asp +++ b/APPL/MGT/fac_srtnotificatie.asp @@ -33,13 +33,13 @@ scaffolding(this_model, "xmlnode", "name", "description", - "notification_mode", - "mode_status", - "mode_email", - "mode_sms", - "mode_alert", + "notificationmode", + "modestatus", + "modeemail", + "modesms", + "modealert", "usermode", - "mail_building", + "mailbuilding", "delay" ] }, @@ -47,23 +47,4 @@ scaffolding(this_model, "cust": iscust } }); - - -function fill_srtnotificatie_LOV() -{ - var xmlnodeLOV = ""; - var sql = "SELECT distinct fac_srtnotificatie_xmlnode" - + " , NVL(fac_srtnotificatie_xmlnode,'') xmlnode_lov" - + " FROM fac_srtnotificatie" - + " ORDER BY 1 NULLS FIRST"; - var oRs = Oracle.Execute(sql); - while (!oRs.eof) - { - var xmlnode = oRs("fac_srtnotificatie_xmlnode").Value; - xmlnodeLOV += (xmlnodeLOV?";":"") + xmlnode + ";" + oRs("xmlnode_lov").Value; - oRs.moveNext(); - } - oRs.Close(); - return xmlnodeLOV; -} %> diff --git a/APPL/MGT/fac_usergraph.asp b/APPL/MGT/fac_usergraph.asp index c268e6309e..8bf5f6fd77 100644 --- a/APPL/MGT/fac_usergraph.asp +++ b/APPL/MGT/fac_usergraph.asp @@ -23,16 +23,16 @@ scaffolding(this_model, "search": { "autosearch": true, "filters": [ - "view_name", - "graph_type" + "viewname", + "graphtype" ] }, "list": { "columns": [ "id", - "view_name", + "viewname", "name", - "graph_type" + "graphtype" ] } }); diff --git a/APPL/MGT/fac_widget.asp b/APPL/MGT/fac_widget.asp index aa37ba540d..50bffd91d6 100644 --- a/APPL/MGT/fac_widget.asp +++ b/APPL/MGT/fac_widget.asp @@ -31,24 +31,24 @@ scaffolding(this_model, "autosearch": true, "filters" : [ "group", - "widget_title" + "title" ] }, "list": { "columns": [ "group", "sequence", - "widget_title", - "link_url", - "widget_heigth", - "widget_width", + "title", + "linkurl", + "widgetheigth", + "widgetwidth", "refreshtime", "created" ], "orderby": [ "group", "sequence", - "widget_title" + "title" ] } });