Merge branch 'fronkdev' into 'master'

Made file pastable in ConstructionConsent/Form

See merge request fronk/thetool!1032
This commit is contained in:
Frank Schubert
2025-02-14 14:49:50 +00:00
+16 -1
View File
@@ -119,6 +119,8 @@
</div> </div>
<hr /> <hr />
<div id="usage-container">
<h4>Nutzung</h4> <h4>Nutzung</h4>
<div class="form-group row"> <div class="form-group row">
@@ -128,6 +130,7 @@
</div> </div>
</div> </div>
<div id="usage-checkbox-container" class="<?=(isset($item) && $item->object_type == "building") ? "hidden": ""?>">
<div class="form-group row mt-3"> <div class="form-group row mt-3">
<div class="col-lg-2"></div> <div class="col-lg-2"></div>
<div class="col-lg-10"> <div class="col-lg-10">
@@ -168,8 +171,9 @@
</div> </div>
</div> </div>
<hr /> </div>
<hr />
<h4>Planskizze / Bilddatei</h4> <h4>Planskizze / Bilddatei</h4>
<div class="form-group row"> <div class="form-group row">
<label class="col-lg-2 col-form-label"></label> <label class="col-lg-2 col-form-label"></label>
@@ -268,11 +272,13 @@
$("#adb_hausnummer_id").val("").change(); $("#adb_hausnummer_id").val("").change();
$("#street-search").show(); $("#street-search").show();
$("#usage-checkbox-container").show();
} else { } else {
$("#street-search").hide(); $("#street-search").hide();
$("#adb_strasse_id").val("").change(); $("#adb_strasse_id").val("").change();
$("#address-search").show(); $("#address-search").show();
$("#usage-checkbox-container").hide();
} }
}); });
@@ -391,6 +397,15 @@
$("#gstnr").val(kg + gst); $("#gstnr").val(kg + gst);
} }
$(window).bind("paste", (e) => {
var files = e.originalEvent.clipboardData.files;
if(files.length > 0) {
$("#consent_plan_image").prop("files", files);
$("#consent_plan_image").change();
}
});
$(document).ready(function(){ $(document).ready(function(){
$('[data-toggle="popover"]').popover(); $('[data-toggle="popover"]').popover();
}); });