Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'fronkdev' into 'master'

Browse Source 
ConstructionConsent Changes

See merge request fronk/thetool!1022
This commit is contained in:
Frank Schubert
2025-02-13 13:36:53 +00:00
parent 7c5045812f ea9e91e6ab
commit 3ed34a8aab
9 changed files with 313 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/ConstructionConsent/ConstructionConsent.php
View File

@@ -80,7 +80,8 @@ class ConstructionConsent extends mfBaseModel {
$pdf = new PdfForm("ConstructionConsent/Consentform.pdf", $pdf_vars);
$wkOpts = "--footer-center '$footer_text' --footer-font-name '$footer_font' --footer-font-size '$footer_size'";
//$wkOpts = "--footer-center '$footer_text' --footer-font-name '$footer_font' --footer-font-size '$footer_size'";
$wkOpts = "--footer-html '".$_SERVER["HTTP_HOST"].MFFANCYBASEURL."/assets/pdf/ConstructionConsent/Consentform.footer.html' --margin-bottom 15mm --margin-top 10mm";
$filename = $pdf->render($wkOpts);
if(!file_exists($filename) || !is_file($filename)) {

8
application/ConstructionConsent/ConstructionConsentController.php
View File

@@ -217,6 +217,14 @@ class ConstructionConsentController extends mfBaseController {
$data["usage_manhole"] = $r->usage_manhole ? 1 : 0;
$data["usage_owner"] = $r->usage_owner ? 1 : 0;
if($r->object_type == "street") {
$data["usage_length"] = 1;
$data["usage_pipe_on_plot"] = 1;
$data["usage_pipe_in_building"] = 1;
$data["usage_manhole"] = 1;
$data["usage_owner"] = 1;
}
if($mode == "add") {
$item = ConstructionConsent::create($data);
} else {