From f3a017894d102b7ebb184f8fa7a0486115d7cfea Mon Sep 17 00:00:00 2001 From: Peter Feij Date: Wed, 29 Sep 2021 12:00:20 +0000 Subject: [PATCH] FCLT#63646 Graphics 2022 savepoint svn path=/Database/trunk/; revision=53198 --- CAD/CAD_VIE.SRC | 21 +++++++++----- FAC/FAC_LCL.SRC | 36 +++++++++++++++--------- FAC/FAC_SET.SRC | 71 ++++++++++++++++++++++++------------------------ _UP/DB40to41.src | 5 ++++ 4 files changed, 78 insertions(+), 55 deletions(-) diff --git a/CAD/CAD_VIE.SRC b/CAD/CAD_VIE.SRC index 2d229f9b..75926462 100644 --- a/CAD/CAD_VIE.SRC +++ b/CAD/CAD_VIE.SRC @@ -208,18 +208,25 @@ SELECT ra.alg_ruimte_key, 'mismatch' CREATE_VIEW(cad_v_label_srtruimteopp,0) (alg_ruimte_key, waarde) AS - SELECT r.alg_ruimte_key, - sr.alg_srtruimte_omschrijving || ' (' || r.alg_ruimte_bruto_vloeropp || ' m2)' - FROM alg_v_aanwezigruimte r, alg_srtruimte sr - WHERE r.alg_srtruimte_key = sr.alg_srtruimte_key; + SELECT r.alg_ruimte_key, + lcl.x ('alg_srtruimte_omschrijving', + sr.alg_srtruimte_key, + sr.alg_srtruimte_omschrijving) + || DECODE (r.alg_ruimte_bruto_vloeropp, + NULL, '', + ' (' || r.alg_ruimte_bruto_vloeropp || ' m2)') + FROM alg_v_aanwezigruimte r, alg_srtruimte sr + WHERE r.alg_srtruimte_key = sr.alg_srtruimte_key; -- Ruimtesoort CREATE_VIEW(cad_v_thema_srtruimte, 0) (alg_ruimte_key, waarde, waarde_key) AS - SELECT r.alg_ruimte_key, sr.alg_srtruimte_omschrijving, r.alg_srtruimte_key - FROM alg_v_aanwezigruimte r, alg_srtruimte sr - WHERE r.alg_srtruimte_key = sr.alg_srtruimte_key(+); + SELECT r.alg_ruimte_key, + sr.alg_srtruimte_omschrijving, // deze moet niet vertaald worden, dat regelt de programmatuur + r.alg_srtruimte_key + FROM alg_v_aanwezigruimte r, alg_srtruimte sr + WHERE r.alg_srtruimte_key = sr.alg_srtruimte_key(+); CREATE_TRIGGER(cad_t_thema_srtruimte_i_iu) INSTEAD OF INSERT OR UPDATE ON cad_v_thema_srtruimte diff --git a/FAC/FAC_LCL.SRC b/FAC/FAC_LCL.SRC index e2ad8c8d..c6bff1a2 100644 --- a/FAC/FAC_LCL.SRC +++ b/FAC/FAC_LCL.SRC @@ -934,15 +934,15 @@ FAC_LCL('lcl_mld_verwerk', 'Verwerken', 'Finalize') FAC_LCL('lcl_mld_verwerk_hint', 'Sluit de melding helemaal en definitief af', 'Finalize this call forever') FAC_LCL('lcl_mld_close_standalone', 'Dank voor uw melding, u kunt dit scherm nu sluiten', 'Thank you for your call, you can now close this screen') FAC_LCL('lcl_mld_object_filled_in', 'Er is automatisch een object ingevuld', 'An object has been automatically selected') -FAC_LCL('lcl_mld_overrule_stdmelding', 'Overruling per melding', 'Overruling per call') -FAC_LCL('lcl_mld_overrule_srtruimte', 'Overruling per ruimtefunctie', 'Overruling per room function') -FAC_LCL('lcl_mld_overrule_properties', 'Overruling kenmerken', 'Overruling properties') -FAC_LCL('lcl_mld_overrule_details', 'Overruling gegevens', 'Overruling details') -FAC_LCL('lcl_mld_overrule', 'Overruling', 'Overruling') -FAC_LCL('lcl_mld_no_overrule', 'Er is geen enkel overruling kenmerken ingevuld', 'Not one overruling detail is entered') +FAC_LCL('lcl_mld_overrule_stdmelding', 'Afwijking per melding', 'Overrule per call') +FAC_LCL('lcl_mld_overrule_srtruimte', 'Afwijking per ruimtefunctie', 'Overrule per room function') +FAC_LCL('lcl_mld_overrule_properties', 'Afwijkende gegevens', 'Overruled properties') +FAC_LCL('lcl_mld_overrule_details', 'Afwijking details', 'Overrule details') +FAC_LCL('lcl_mld_overrule', 'Afwijking van standaard', 'Overrule of default') +FAC_LCL('lcl_mld_no_overrule', 'Er is geen afwijkend kenmerken ingevuld', 'No overruled properties are entered') FAC_LCL('lcl_mld_will_be_closed', 'Let op: de gekozen melding is al afgehandeld. Door aan die melding te koppelen zal deze melding nu ook worden afgemeld. Wilt u dat echt?', 'Please note: the selected call has already been closed. Linking to that call will also close this call. Are you sure?') FAC_LCL('lcl_mld_will_be_rejected', 'Let op: de gekozen melding is al afgewezen. Door aan die melding te koppelen zal deze melding nu ook worden afgewezen. Wilt u dat echt?', 'Please note: the selected call has already been rejected. Linking to that call will also reject this call. Are you sure?') -FAC_LCL('lcl_mld_del_txt_stdmsrtruimte', 'Weet u zeker dat u deze overruling wilt verwijderen?', 'Are you sure you want to delete this overruling?') +FAC_LCL('lcl_mld_del_txt_stdmsrtruimte', 'Weet u zeker dat u deze afwijking wilt verwijderen?', 'Are you sure you want to delete this overrule?') FAC_LCL('lcl_mld_addmld', 'Melding toevoegen', 'Add call') FAC_LCL('lcl_mld_frozen_costs', 'Bevroren kosten', 'Frozen costs') FAC_LCL('lcl_mld_prsobjects', 'Inclusief persoonsobjecten', 'Include personal objects') @@ -1407,6 +1407,7 @@ FAC_LCL('lcl_reject_hint', 'Wijs deze melding af (wordt niet verder behandeld)', COMMIT; FAC_LCL('lcl_close_hint', 'Sluit deze melding nu af, de afhandeling is gereed.', 'Close this call right now, no further action required') +FAC_LCL('lcl_mldclose_after_opdrclose', 'Voordat je deze melding kunt afmelden zul je alle opdrachten afgemeld moeten hebben', 'Before you can close this call, you will need to close all orders') FAC_LCL('lcl_orders_hint', 'Accepteer deze melding en maak direct een opdracht aan', 'Accept this call and create an order directly') FAC_LCL('lcl_orders_no_contractor', 'Opdracht niet automatisch aangemaakt omdat uitvoerende niet bepaald kon worden', '(Auto) order has not been created because no contractor could be determined') FAC_LCL('lcl_orders_no_account', 'Opdracht niet automatisch aangemaakt omdat kostenplaats niet bepaald kon worden', '(Auto) order has not been created because no cost centre could be determined') @@ -2032,6 +2033,7 @@ FAC_LCL('lcl_mld_inf_opmerking_fiat', 'Reden', 'Reason') FAC_LCL('lcl_mld_inf_Kostenplaats', 'Kostenplaats', 'Cost centre') FAC_LCL('lcl_mld_inf_Kostenklant', 'Kosten klant', 'Cust. pays') FAC_LCL('lcl_mld_inf_Ordernr', 'Opdrachtnr', 'Order nr') +FAC_LCL('lcl_mld_inf_volg_link', 'Klik of tik om de koppeling te volgen', 'Click or tap to follow the link') FAC_LCL('lcl_mld_urg', 'Prioriteit', 'Priority') FAC_LCL('lcl_mld_urg_kritiek', 'Kritiek', 'Critical') FAC_LCL('lcl_mld_urg_hoog', 'Hoog', 'High') @@ -3306,9 +3308,13 @@ FAC_LCL('lcl_fg_tek_room_opp_dif', 'Verschil', 'Difference') FAC_LCL('lcl_fg_tek_fac_change_file', 'Facilitor: Wijzigen tekeningbestand', 'Facilitor: Change drawing file') FAC_LCL('lcl_fg_room_opp_dif_tot', 'Verschil totaal', 'Total difference') FAC_LCL('lcl_fg_info', 'Informatie', 'Information') -FAC_LCL('lcl_fg_obj_filter', 'Objectgroepen', 'Object groups') -FAC_LCL('lcl_fg_obj_add', 'Objecten toevoegen', 'Add objects') -FAC_LCL('lcl_fg_obj_legend', 'Objectlegenda', 'Legend of symbols') +FAC_LCL('lcl_fg_room_filter', 'Ruimten', 'Rooms') +FAC_LCL('lcl_fg_norooms', 'Niets geselecteerd', 'No room selected') +FAC_LCL('lcl_fg_noterrains', 'Niets geselecteerd', 'No terrains selected') +FAC_LCL('lcl_fg_terr_filter', 'Terreinen', 'Terrains') +FAC_LCL('lcl_fg_obj_filter', 'Objectlagen', 'Object layers') +FAC_LCL('lcl_fg_obj_legend', 'Symbolen', 'Symbols') +FAC_LCL('lcl_fg_obj_aantal', 'Komt hier {0} keer voor', 'Occurs {0} times here') FAC_LCL('lcl_fg_obj_noedit', 'Je hebt autorisatie nodig'||CHR(10)||'om deze te verplaaten.', 'Not authorised to change this object.') FAC_LCL('lcl_fg_notdraggable', 'Verplaats deze markering door het opnieuw te plaatsen vanuit de lijst', 'You can move this marker by dragging it from the list') FAC_LCL('lcl_fg_obj_firstnew', 'Nieuwe symbolen moeten eerst binnen een ruimte geplaatst worden.', 'New symbols have to be placed within a room.') @@ -3377,7 +3383,6 @@ FAC_LCL('lcl_slnk_select', 'Aanwijsmodus', 'Select mode') FAC_LCL('lcl_slnk_zoomrectangle', 'Inzoomen op gebied', 'Zoom rectangle') FAC_LCL('lcl_slnk_zoomout', 'Uitzoomen', 'Zoom out') FAC_LCL('lcl_slnk_zoomextents', 'Totaalplaatje', 'Zoom extents') -FAC_LCL('lcl_slnk_editmode', 'Wijzigmodus', 'Edit-mode') FAC_LCL('lcl_slnk_refresh', 'Verversen', 'Refresh') FAC_LCL('lcl_slnk_legenda', 'Legenda', 'Legend') FAC_LCL('lcl_slnk_print', 'Afdrukken', 'Print') @@ -3389,7 +3394,6 @@ FAC_LCL('lcl_slnk_labeldefault', 'Labels standaard', 'Labelpostion default') FAC_LCL('lcl_slnk_labelcenter', 'Labels centreren', 'Labelposition center') FAC_LCL('lcl_slnk_labeltopleft', 'Labels linksboven', 'Labelposition topleft') FAC_LCL('lcl_slnk_copy', 'Kopiëren', 'Copy') -FAC_LCL('lcl_slnk_maximize', 'Open in volledig scherm', 'Open fullscreen') FAC_LCL('lcl_slnk_symbolmenu', 'Objectmenu', 'Object options') FAC_LCL('lcl_slnk_rotateright', 'Kwartslag rechtsom', 'Rotate 90 right') @@ -3403,6 +3407,11 @@ FAC_LCL('lcl_slnk_resetpos', 'Reset positie', 'Reset position') FAC_LCL('lcl_slnk_delete', 'Verwijderen', 'Delete') FAC_LCL('lcl_slnk_properties', 'Details', 'Details') +FAC_LCL('lcl_cad_enterangle', 'Geef de hoek op (0-359)', 'Enter the rotation (0-359)') +FAC_LCL('lcl_cad_maximize', 'Toon in volledig scherm', 'Open fullscreen') +FAC_LCL('lcl_cad_editmode', 'Naar wijzigmodus', 'Edit-mode') +FAC_LCL('lcl_cad_togglepanes', 'Zet panelen aan/uit', 'Toggle panes on/off') +FAC_LCL('lcl_cad_infoboard', 'Preview als infobord', 'Preview as infoscreen') FAC_LCL('lcl_cil_cilinder', 'Cilinder', 'Cylinder') @@ -5105,7 +5114,7 @@ FAC_LCL('lcl_shared_validator_format', 'Controleer het formaat van de ingevulde FAC_LCL('lcl_shared_validator_format_currency', 'Vul hier een geldig bedrag in.','Please fill in a valid amount.') FAC_LCL('lcl_shared_validator_format_number', 'Vul hier een geldig nummer in.','Please fill in a valid number.') FAC_LCL('lcl_shared_validator_length', 'Veld {0} is te lang. Maximum is {1} karakters, huidig is {2}.','Field {0} is too long. Maximum is {1} characters, current is {2}.') -FAC_LCL('lcl_shared_suggest_hint', 'U kunt hier typend zoeken of op het symbool klikken.'||CHR(10)||'Begin met ''*'' voor willekeurig begin.','You can type here or click the symbol.'||CHR(10)||'Start with ''*'' to search with a wildcard.') +FAC_LCL('lcl_shared_suggest_hint', 'Je kunt hier slim typen of op het symbool klikken.'||CHR(10)||'Begin met ''*'' voor willekeurig begin.','You can type here or click the symbol.'||CHR(10)||'Start with ''*'' to search with a wildcard.') FAC_LCL('lcl_shared_suggest_huidig', '(huidige waarde)','(current value)') FAC_LCL('lcl_shared_suggest_more', 'Meer>>','More>>') FAC_LCL('lcl_shared_suggest_toomany', 'Te veel resultaten. Geef meer tekens.','Too many results. Please enter more characters.') @@ -5768,6 +5777,7 @@ FAC_LCL('fac_widget_content', 'HTML code', 'Raw HTML') FAC_LCL('fac_widget_groep', 'Widgetgroep', 'Widget group') FAC_LCL('fac_widget_title', 'Widgetitel', 'Widget title') FAC_LCL('fac_widget_url', 'Inhoud-URL', 'URL') +FAC_LCL('fac_widget_querystring', 'Querystring', 'Querystring') FAC_LCL('fac_widget_volgnr', 'Volgnr', 'Sequence nr') FAC_LCL('fac_widget_refreshtime', 'Verversingtijd', 'Refresh time') FAC_LCL('fac_widget_id', 'HTML-ID', 'HTML-ID') diff --git a/FAC/FAC_SET.SRC b/FAC/FAC_SET.SRC index e18c4917..f7dbde36 100644 --- a/FAC/FAC_SET.SRC +++ b/FAC/FAC_SET.SRC @@ -155,15 +155,14 @@ DEFINE_SETTING('BEZ', 0001, 'WEB_FACTAB', 'vis_parking_key' DEFINE_SETTING('BEZ', 0001, 'WEB_PRSSYS', 'vis_fobo_default_locatie_empty' , 'boolean' , 'false' , 'No auto fill location when selecting host for new appointment back/front-office') DEFINE_SETTING('BGT', 0001, 'WEB_FACTAB', 'bgt_enabled' , 'number' , '0' , 'Is Facilitor Budgetting module (BGT) available {0 | 1}') DEFINE_SETTING('BGT', 0001, 'WEB_FACTAB', 'bgtd_image_path' , 'string' , NULL , 'path to folder storing bgt discipline pictures') -DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_ThemaAlpha' , 'number' , '224' , 'Default roomcontour transparancy. 255==solid!') -DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_WPScale' , 'float' , '1' , 'Schaal voor werkplek symbolen tov 1.0') +DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_themaalpha' , 'number' , '224' , 'Default roomcontour transparancy. 255=solid') +DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_wpscale' , 'float' , '1' , 'Relative scale for workplace symbol') DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_antialias' , 'number' , '2' , 'Antialias, 1=off, 2=pleasant, 4=slower') -DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_contourAlpha' , 'number' , '0' , 'Default roomcontour transparancy. 0==invisible!') -DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_dobbelDist' , 'number' , '1400' , 'Afstand dobbel symbolen (mm)') -DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_dobbelScale' , 'float' , '0.5' , 'Schaal voor de dobbelsymbolen versus normale grootte') -DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_maximize' , 'boolean' , 'true' , 'Maximaliseer plaatje naar wat echt zichtbaar is.') -DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_startBuiten' , 'boolean' , 'false' , 'Bij binnenkomst van FGII buiten/terrein-situatie tonen') -DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_translateprintcolor' , 'json' , '[]' , 'Kleurvertalingen bij printen') +DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_contouralpha' , 'number' , '0' , 'Default roomcontour transparancy. 0=invisible') +DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_dobbeldist' , 'number' , '1400' , 'Distance for dice symbols (mm)') +DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_dobbelscale' , 'float' , '0.5' , 'Relative scale for dice symbols') +DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_maximize' , 'boolean' , 'true' , 'Maximize symbol to visible area') // in begrijpelijke taal=? +DEFINE_SETTING('CAD', 0001, 'WEB_FACTAB', 'fg_translateprintcolor' , 'json' , '[]' , 'Color-translations for printing of plans') DEFINE_SETTING('CNT', 0001, 'WEB_FACTAB', 'cnt_srttype_rental' , 'number' , '2' , 'cnt_srtcontract_type of room rental contract type') DEFINE_SETTING('CNT', 0001, 'WEB_FACTAB', 'cntd_image_path' , 'string' , NULL , 'path to folder storing cnt discipline pictures') DEFINE_SETTING('FAC', 0001, 'WEB_FACTAB', 'NotifyMessageInterval' , 'number' , '0' , 'time (seconds) between NotifyMessage.asp [=Check for popups] refreshes. 0=disable') @@ -348,33 +347,35 @@ DEFINE_SETTING('BEZ', 0001, 'WEB_PRSSYS', 'vis_warning_limit' DEFINE_SETTING('BGT', 0001, 'WEB_PRSSYS', 'bgt_extra_report_param' , 'boolean' , 'false' , 'Extra parameter aan xml toevoegen waarop niet gefilterd wordt') DEFINE_SETTING('BGT', 0001, 'WEB_PRSSYS', 'bgt_usrtab_vaste_factuurnummer' , 'string' , '' , 'Naam van usertable waarin de standaard (niet unieke) factuurnummers in staan') DEFINE_SETTING('BGT', 0001, 'WEB_PRSSYS', 'bgt_photo_size' , 'string' , 'r512x512' , 'Resize uploads to this maximum BGT photo size. Ex: r200x150') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_areaThreshold' , 'number' , '7000100' , 'Bij kleiner oppervlakte dunnere contour en kleiner label') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_bitmapsymbolsize' , 'number' , '1000' , 'Symbool hoogte bitmap symbolen.') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_contourColor' , 'number' , '65280' , 'Default roomcontour coloring') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_contourColorCpt' , 'number' , '16776960' , 'Default roomcontour coloring concept new rooms') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_contourWeight' , 'number' , '100' , 'Default roomcontour width. 100mm;') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_contour_minArea' , 'number' , '200010' , 'minimale mm2 om herkend te worden als ruimte (millimeter! dus)') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_contourlayers' , 'string' , '{CONT!.}|{CONT\|.*}' , NULL) -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_contourlayers_alt2' , 'string' , '' , NULL) -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_contourlayers_alt1' , 'string' , '' , NULL) +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_areathreshold' , 'float' , '2.0' , 'Minimal contour area (m2) to display a full size label') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_bitmapsymbolsize' , 'number' , '1000' , 'Symbol height for bitmap symbols') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_contourcolor' , 'number' , '65280' , 'Default roomcontour coloring') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_contourcolorcpt' , 'number' , '16776960' , 'Default roomcontour coloring new rooms in concept drawings') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_contourWeight' , 'number' , '100' , 'Default roomcontour width (mm)') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_contour_minArea' , 'number' , '200010' , 'Minimal area (mm2) to be recognised as a relevant contour') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_contourlayers' , 'string' , '{CONT!.}|{CONT\|.*}' , 'Regexp for contourlayernames default areas') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_contourlayers_alt1' , 'string' , '' , 'Regexp for contourlayernames alternative areas 1') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_contourlayers_alt2' , 'string' , '' , 'Regexp for contourlayernames alternative areas 2') DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_dwgscale' , 'float' , '1000' , 'AutoCAD Drawing scale units/meter (future use)') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_inINSLabelSize' , 'number' , '250' , 'Binnen objectlabels grootte') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_inLabelSize' , 'number' , '800' , 'Binnen ruimtelabels grootte (mm)') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_inWPLabelSize' , 'number' , '400' , 'Binnen wekrpleklabels grootte') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_ins_symbols' , 'boolean' , 'false' , 'Objecten als symbolen in de tekening plaatsen.') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_labelPosition' , 'number' , '1' , '1=default, 2=center, 3=topleft') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_labellayers' , 'string' , '{CONT!.}|{CONT\|.*}' , NULL) -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_labellayers_alt2' , 'string' , '' , NULL) -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_labellayers_alt1' , 'string' , '' , NULL) -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_mobile_label' , 'number' , '-1' , 'Label theme to be used on Mobile plans (key)') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_mobile_thema' , 'number' , '-1' , 'Fixed theme to use on Mobile plans (key, -1 = let user select theme)') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_outINSLabelSize' , 'number' , '8000' , 'Buiten objectlabels grootte') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_outLabelSize' , 'number' , '16000' , 'Buiten terreinsectorlabels grootte') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_paperColor' , 'number' , '15395820' , 'paper background or -1 for ''as published''') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_paperColorCpt' , 'number' , '13684944' , 'paper background concept') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_publiclayers' , 'array' , '' , 'ins_disc_keys of layers visible without INSUSE') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_werkpleksymbool' , 'string' , 'WERKPLEK' , 'Symbol for workplace in Graphics, file must exist in fg_symbols_path') -DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'cad_symbols_snap' , 'number' , '1' , 'Snap INS-objects to grid, <1 =off, >=1 =grid in mm') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_hilitebordercolor' , 'number' , '0xF59D04' , 'Default contour hilite border coloring') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_hilitefillcolor' , 'number' , '0xE02D93' , 'Default contour hilite fill coloring') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_ininslabelSize' , 'number' , '250' , 'Default labelsize for objects inside (mm)') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_inlabelsize' , 'number' , '800' , 'Default labelsize for rooms inside (mm)') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_inwplabelsize' , 'number' , '400' , 'Default labelsize for worplaces inside (mm)') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_ins_symbols' , 'boolean' , 'false' , 'Use objects as symbols on floorplans') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_labelposition' , 'number' , '1' , 'Labelposition of roomlabels 1=original, 2=center, 3=topleft') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_labellayers' , 'string' , '{CONT!.}|{CONT\|.*}' , 'Regexp for contourlabellayernames default areas') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_labellayers_alt1' , 'string' , '' , 'Regexp for contourlabellayernames alternative areas 1') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_labellayers_alt2' , 'string' , '' , 'Regexp for contourlabellayernames alternative areas 2') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_mobile_label' , 'number' , '-1' , 'Standard labels to use on Mobile plans (key)') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_mobile_thema' , 'number' , '-1' , 'Standard theme to use on Mobile plans (key, -1=user select)') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_outinslabelsize' , 'number' , '8000' , 'Default labelsize for objects outside (mm)') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_outlabelsize' , 'number' , '16000' , 'Default labelsize for terrains outside (mm)') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_papercolor' , 'number' , '15395820' , 'Background color (-1=as published)') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_papercolorcpt' , 'number' , '13684944' , 'Background color for concept drawings') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_publiclayers' , 'array' , '' , 'Discipline keys for layers to be visible even without WEB_INSUSE authorisation') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'fg_werkpleksymbool' , 'string' , 'WERKPLEK' , 'Workplace symbol name (dwf-file, must exist in fg_symbols_path)') +DEFINE_SETTING('CAD', 0001, 'WEB_PRSSYS', 'cad_symbols_snap' , 'number' , '1' , 'Snap objects to grid (grid in mm), <1=off') DEFINE_SETTING('CHT', 0001, 'WEB_PRSSYS', 'cht_bo_naam' , 'number' , '0' , 'Toon naam van servicedesk medewerker 0=eigen naam 1=algemene term') DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_all_kostenplaats' , 'number' , '0' , 'show all (1) active kostenplaats values or only the one i have mandate for (0) in list') DEFINE_SETTING('CNT', 0001, 'WEB_PRSSYS', 'cnt_approval_all' , 'number' , '0' , 'Goedkeuring contract vereist t.o.v. eerstvolgende limiet (=0 default) of t.o.v. totale kosten (in één keer)(=1)') @@ -404,7 +405,7 @@ DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'ReplyAddress' DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'anonymize_period' , 'number' , '365' , 'Period before data wil be [GDPR] anonymized (days)') DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'aut_login_strip_domain' , 'number' , '1' , 'Strip AD domain from login name { 0=no, 1=yes (default) } (Future use)') DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'auth_edit_advanced' , 'boolean' , 'false' , 'Start autorisation popup dialog in advanced mode') -DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'buttons_in_hamburger' , 'array' , 'print.png,email.png,csv.png,fa-print,fa-envelope-o,excel.png,fa-table,fa-sync,page_refresh.png,legenda.png,fa-columns,fa-share-alt', 'Hide these frameheader buttons behind a hamburger.') +DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'buttons_in_hamburger' , 'array' , 'print.png,email.png,csv.png,fa-print,fa-envelope-o,excel.png,fa-table,fa-sync,page_refresh.png,legenda.png,fa-columns,fa-share-square', 'Hide these frameheader buttons behind a hamburger.') DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'can_selfapprove' , 'number' , '999999' , 'I can approve myself below or equal this limit or someone else must approve always above this limit') DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'checkBrowser' , 'number' , '0' , 'Check for IE6 at login (1) or not.') DEFINE_SETTING('FAC', 0001, 'WEB_PRSSYS', 'currency_icon' , 'string' , 'fa-euro-sign' , 'Currency icon. Use fa-money-bill-wave for generic') diff --git a/_UP/DB40to41.src b/_UP/DB40to41.src index 745ecf4a..8df2fbb1 100644 --- a/_UP/DB40to41.src +++ b/_UP/DB40to41.src @@ -128,6 +128,7 @@ ALTER TABLE fac_widget MODIFY fac_widget_width NUMBER(5); ALTER TABLE fac_widget ADD fac_widget_type VARCHAR2(1) DEFAULT ('U') NOT NULL; ALTER TABLE fac_widget ADD fac_widget_typerefkey NUMBER(10); ALTER TABLE fac_widget ADD fac_widget_content VARCHAR2(4000); +ALTER TABLE fac_widget ADD fac_widget_public NUMBER(1) DEFAULT 0 NOT NULL; ALTER TABLE fac_widget ADD CONSTRAINT fac_c_widgettype1 CHECK ( (fac_widget_type IN ('U', 'X', 'I') AND fac_widget_url IS NOT NULL) @@ -181,6 +182,10 @@ UPDATE ins_srtdeel AND s.ins_srtgroep_key = g.ins_srtgroep_key AND BITAND (ins_disc_params_type, 16) = 16); +// fac_setting_type en fac_setting_default veranderen wel bij de recreate +UPDATE fac_setting + SET fac_setting_pvalue = fac_setting_pvalue / 1000000 + WHERE fac_setting_name = 'fg_areathreshold' AND fac_setting_type = 'number'; /////////////////////////////////////////////////////////////////////////////////////////// MARX#68582 DROP CONSTRAINT res_c_alg_ruimte_or_opstel;