Fixed Overflow Issue
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
$pagination_baseurl = $this->getUrl($Mod,"Index");
|
||||
$pagination_baseurl_params = ["filter" => $filter];
|
||||
$pagination_entity_name = "Leitungsbauaufträge";
|
||||
|
||||
|
||||
if(!is_array($filter)) $filter = [];
|
||||
?>
|
||||
<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
|
||||
@@ -10,10 +10,10 @@
|
||||
|
||||
<style>
|
||||
@media (max-width: 1750px) {
|
||||
#viewCard {
|
||||
max-height: 80vh;
|
||||
overflow: scroll;
|
||||
}
|
||||
#viewCard > .card-body {
|
||||
max-height: 80vh;
|
||||
overflow: scroll;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -35,11 +35,11 @@
|
||||
|
||||
<div class="row">
|
||||
<div class="col-lg-12">
|
||||
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body mb-3">
|
||||
<h4 class="header-title mb-3">Filter</h4>
|
||||
|
||||
|
||||
<form method="get" id="filterform" action="<?=self::getUrl("Linework")?>">
|
||||
<div class="row">
|
||||
<div class="col-1">
|
||||
@@ -51,7 +51,7 @@
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-1">
|
||||
<label class="form-label" for="filter_networksection_id">Bauabschnitt</label>
|
||||
<select name="filter[networksection_id]" id="filter_networksection_id" class="form-control">
|
||||
@@ -67,14 +67,14 @@
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="filter_status_id">Anschlussstatus</label>
|
||||
<select name="filter[status_id]" id="filter_status_id" class="form-control">
|
||||
<option></option>
|
||||
<?php foreach(TerminationstatusModel::getAll() as $status): ?>
|
||||
<option
|
||||
value="<?=$status->id?>"
|
||||
value="<?=$status->id?>"
|
||||
<?php if(array_key_exists("status_id", $filter)): ?>
|
||||
<?=($filter['status_id'] == $status->id) ? "selected='selected'" : ""?>
|
||||
<?php else: ?>
|
||||
@@ -85,7 +85,7 @@
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="filter_linework_doku_delay">Dokuaufschub</label>
|
||||
<select name="filter[linework_doku_delay]" id="filter_linework_doku_delay" class="form-control">
|
||||
@@ -93,20 +93,20 @@
|
||||
<option value="1" <?=($filter['linework_doku_delay'] == 1) ? "selected='selected'" : ""?>>Anzeigen</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-1">
|
||||
<label class="form-label" for="filter_code">Objekt ID</label>
|
||||
<input type="text" class="form-control" name="filter[code]" id="filter_code" value="<?=$filter['code']?>" />
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="filter_building_street">Straße</label>
|
||||
<input type="text" class="form-control" name="filter[building_street]" id="filter_building_street" value="<?=$filter['building_street']?>" />
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<div class="row mt-2">
|
||||
<div>
|
||||
@@ -114,7 +114,7 @@
|
||||
<a class="btn btn-secondary" href="<?=self::getUrl("Linework")?>">Filter zurücksetzen</a>
|
||||
</div>
|
||||
<div style="width: 512px;">
|
||||
|
||||
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<button type="button" id="export-button" class="form-control btn btn-outline-success ml-2" onclick="exportButtonClick()">
|
||||
@@ -123,18 +123,18 @@
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card" id="viewCard">
|
||||
<div class="card-body mb-3">
|
||||
<h4 class="header-title">Auftragsliste nach Netzgebiet</h4>
|
||||
|
||||
|
||||
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
|
||||
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
|
||||
|
||||
@@ -158,7 +158,7 @@
|
||||
</tr>
|
||||
<?php $bcount = 0;
|
||||
foreach($terminations as $term): ?>
|
||||
|
||||
|
||||
<?php if($bcount > 0): ?>
|
||||
<tr id="termination-<?=$term->id?>-top-header" class="hidden">
|
||||
<th>Anschluss</th>
|
||||
@@ -210,7 +210,7 @@
|
||||
<?=($term->getWorkflowvalue('inhouse_cabling_deployed') != "1") ? "<i class='fas fa-times text-danger'></i>" : "<i class='fas fa-check text-success'></i>" ?>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
|
||||
|
||||
<td onclick="togglePipework(<?=$term->id?>)"><?=($term->getWorkflowvalue('customer_passive_finished') != "1") ? "<i class='fas fa-times text-danger'></i>" : "<i class='fas fa-check text-success'></i>" ?></td>
|
||||
</tr>
|
||||
<tr id="termination-<?=$term->id?>" class="table-bg-<?=($bcount % 2 == 0) ? "even" : "odd"?> hidden">
|
||||
@@ -227,7 +227,7 @@
|
||||
<br />
|
||||
<span class="text-monospace">[<?=__($term->building->status->name."-b")?>]</span>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="mt-2 mb-2">
|
||||
<a href="<?=self::getUrl("Pipework", "Index", ["filter" => ["code" => $term->building->code]])?>" target="_blank"><span class="text-success"><?=$term->code?></span></a>
|
||||
<br />
|
||||
@@ -235,7 +235,7 @@
|
||||
<?=$term->name?><br />
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
||||
|
||||
<?php if($term->building->network_id):?>
|
||||
<div style="hyphens: auto;">
|
||||
<strong>Netzgebiet</strong>: <?=$term->building->network->name?>
|
||||
@@ -246,16 +246,16 @@
|
||||
<strong>Bauabschnitt</strong>: <?=$term->building->networksection->name?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="mt-3">
|
||||
<?=$term->contact?><br />
|
||||
<strong><?=$term->phone?></strong><br />
|
||||
<?=$term->email?>
|
||||
</div>
|
||||
|
||||
|
||||
<?php if($me->is("Admin", "netowner")): ?>
|
||||
<div class="mt-3">
|
||||
<label <?=(!$term->building->lineworker_id) ? "class='text-danger' title='Keine Leitungsbaufirma ausgewählt'" : ""?>>
|
||||
@@ -417,7 +417,7 @@
|
||||
<td></td></tr>
|
||||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
|
||||
|
||||
<tr>
|
||||
<td>
|
||||
<strong>Dokument hochladen</strong> <select class="form-control" name="file_type">
|
||||
@@ -460,13 +460,13 @@
|
||||
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination-summary.php"); ?>
|
||||
<?php include(realpath(dirname(__FILE__)."/../")."/tpl/pagination.php"); ?>
|
||||
|
||||
|
||||
|
||||
<?php else: ?>
|
||||
<i>Keine Bauaufträge gefunden</i>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -484,7 +484,7 @@ $(document).ready(function() {
|
||||
var pos = $('#termination-' + term + "-summary").offset().top;
|
||||
$(window).scrollTop(pos - 182);
|
||||
}
|
||||
|
||||
|
||||
$('input[name=wfitemplaceholder_customer_passive_finished]').each(function() {
|
||||
var elem = this;
|
||||
$(elem).click(function() {
|
||||
@@ -492,7 +492,7 @@ $(document).ready(function() {
|
||||
var id = id_match[1];
|
||||
validateWorkflowItem(id);
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
|
||||
$('select[id^="wfitem_abschlusstyp_"]').each(function() {
|
||||
@@ -500,7 +500,7 @@ $(document).ready(function() {
|
||||
$(elem).change(function() {
|
||||
var id_match = $(this).attr("id").match(/wfitem_abschlusstyp_(\d+)$/);
|
||||
var id = id_match[1];
|
||||
|
||||
|
||||
if($('#wfitem_ist_abschlusstyp_' + id).val() == "") {
|
||||
if($(this).val() == "SC/APC in FTU") {
|
||||
$('#workflow-item-inhouse_cabling_supplied-' + id + ' .wf-content').show();
|
||||
@@ -535,13 +535,13 @@ $(document).ready(function() {
|
||||
});
|
||||
$(elem).change();
|
||||
});
|
||||
|
||||
|
||||
$('select[id^="wfitem_ist_abschlusstyp_"]').each(function() {
|
||||
var elem = this;
|
||||
$(elem).change(function() {
|
||||
var id_match = $(this).attr("id").match(/wfitem_ist_abschlusstyp_(\d+)$/);
|
||||
var id = id_match[1];
|
||||
|
||||
|
||||
if($(this).val() == "") {
|
||||
console.log("ist empty");
|
||||
if($('#wfitem_abschlusstyp_' + id).val() == "SC/APC in FTU") {
|
||||
@@ -562,7 +562,7 @@ $(document).ready(function() {
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
if($(elem).val() == "SC/APC in FTU") {
|
||||
$(elem).change();
|
||||
}
|
||||
@@ -572,7 +572,7 @@ $(document).ready(function() {
|
||||
$('form[id^="wf-termination-"]').each(function() {
|
||||
var elem = this;
|
||||
$(elem).submit(function(e) {
|
||||
|
||||
|
||||
console.log(this);
|
||||
var id_match = $(this).attr("name").match(/wf-termination-(\d+)$/);
|
||||
var id = id_match[1];
|
||||
@@ -584,8 +584,8 @@ $(document).ready(function() {
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
});
|
||||
|
||||
|
||||
@@ -615,7 +615,7 @@ function validateWorkflowItem(id) {
|
||||
spliced_network: "bool",
|
||||
spliced_customer: "bool",
|
||||
};
|
||||
|
||||
|
||||
console.log("abschlusstyp: " + $("#wfitem_abschlusstyp_" + id).val());
|
||||
console.log("ist abschlusstyp: " + $("#wfitem_ist_abschlusstyp_" + id).val());
|
||||
if($("#wfitem_abschlusstyp_" + id).val() == "SC/APC in FTU") {
|
||||
@@ -631,18 +631,18 @@ function validateWorkflowItem(id) {
|
||||
delete required_fields["inhouse_cabling_deployed"];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
var missing = false;
|
||||
for(var field1 in required_fields) {
|
||||
var field2 = "ist_" + field1;
|
||||
var type = required_fields[field1];
|
||||
|
||||
|
||||
var val1 = $("#wfitem_" + field1 + "_" + id).val();
|
||||
var val2 = true;
|
||||
if($("#wfitem_" + field2 + "_" + id).length) {
|
||||
var val2 = $("#wfitem_" + field2 + "_" + id).val();
|
||||
}
|
||||
|
||||
|
||||
if(type == "bool") {
|
||||
if(!parseInt(val1)) {
|
||||
console.log(field1 + " missing");
|
||||
@@ -655,27 +655,27 @@ function validateWorkflowItem(id) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
console.log("missing: ");
|
||||
console.log(missing);
|
||||
|
||||
|
||||
if(missing) {
|
||||
$("#wfitemplaceholder_customer_passive_finished_" + id).prop('checked', false);
|
||||
$("#wfitem_customer_passive_finished_" + id).val(0);
|
||||
$("#wfitemplaceholder_customer_passive_finished_" + id).attr("readonly", true);
|
||||
|
||||
|
||||
} else {
|
||||
$("#wfitemplaceholder_customer_passive_finished_" + id).attr("disabled", false);
|
||||
$("#wfitem_customer_passive_finished_" + id).val(1);
|
||||
$("#wfitemplaceholder_customer_passive_finished_" + id).prop('readonly', true);
|
||||
$("#wf-submit-error-" + id).hide();
|
||||
}
|
||||
|
||||
|
||||
return !missing;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
function canSubmit(id) {
|
||||
if($("#wfitemplaceholder_customer_passive_finished_" + id).prop('checked')) {
|
||||
if(!validateWorkflowItem(id)) {
|
||||
@@ -688,7 +688,7 @@ function validateWorkflowItem(id) {
|
||||
$("#wf-submit-error-" + id).hide();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
function validateAndSubmit(id) {
|
||||
//e.preventDefault();
|
||||
if(canSubmit(id)) {
|
||||
@@ -696,16 +696,16 @@ function validateWorkflowItem(id) {
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
var export_uid = "";
|
||||
var export_progress = 0;
|
||||
var downloadUrl;
|
||||
|
||||
|
||||
$('#filterform').change(function() {
|
||||
downloadUrl = "";
|
||||
});
|
||||
|
||||
|
||||
/*
|
||||
* Eport button click
|
||||
*/
|
||||
@@ -714,8 +714,8 @@ function validateWorkflowItem(id) {
|
||||
document.location.href = '<?=self::getUrl("Linework","downloadExport")?>?uid=' + export_uid
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
var form = $('#filterform');
|
||||
var actionUrl = '<?=self::getUrl("Linework", "export")?>';
|
||||
/*var formdata = new FormData(form);
|
||||
@@ -723,9 +723,9 @@ function validateWorkflowItem(id) {
|
||||
//console.log(key + ": " + value);
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
console.log(form.serialize());
|
||||
|
||||
|
||||
$.ajax({
|
||||
type: "POST",
|
||||
url: actionUrl,
|
||||
@@ -751,12 +751,12 @@ function validateWorkflowItem(id) {
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
function updateExportProgress() {
|
||||
if(!export_uid) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
$.get("<?=self::getUrl("Linework", "exportProgress")?>",
|
||||
{
|
||||
uid: export_uid
|
||||
@@ -776,21 +776,21 @@ function validateWorkflowItem(id) {
|
||||
"json"
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
function updateProgressBar(progress) {
|
||||
$('#progress-bar').css("width", progress + "%");
|
||||
$('#progress-bar').text("Bitte warten... " + progress + "%");
|
||||
|
||||
|
||||
/*if(progress > 50) {
|
||||
$('#progress-bar').removeClass("text-secondary");
|
||||
}*/
|
||||
|
||||
|
||||
if(progress >= 100) {
|
||||
$('#progress-bar').addClass("bg-success").removeClass("bg-primary");
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
function clearProgressBar() {
|
||||
//$('#progress-bar-wrapper').hide();
|
||||
$('#progress-bar').css("width", "0%");
|
||||
@@ -804,6 +804,6 @@ function validateWorkflowItem(id) {
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>
|
||||
|
||||
Reference in New Issue
Block a user