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

Finished Line- & Pipework export

Browse Source
This commit is contained in:
Frank Schubert
2022-06-21 14:32:25 +02:00
parent e3438bc96c
commit 43185a914f
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Layout/default/Linework/Index.php
View File

@@ -104,7 +104,7 @@
<a class="btn btn-secondary" href="<?=self::getUrl("Linework")?>">Filter zurücksetzen</a>
</div>
<div style="width: 512px;">
<?php if($me->isAdmin()): ?>
<div class="row">
<div class="col-6">
<button type="button" id="export-button" class="form-control btn btn-outline-success ml-2" onclick="exportButtonClick()">
@@ -114,7 +114,6 @@
</div>
</div>
<?php endif; ?>
</div>
</div>
</form>

2
Layout/default/Pipework/Index.php
View File

@@ -96,7 +96,6 @@
<a class="btn btn-secondary" href="<?=self::getUrl("Pipework")?>">Filter zurücksetzen</a>
</div>
<div style="width: 512px;">
<?php if($me->isAdmin()): ?>
<div class="row">
<div class="col-6">
<button type="button" id="export-button" class="form-control btn btn-outline-success ml-2" onclick="exportButtonClick()">
@@ -106,7 +105,6 @@
</div>
</div>
<?php endif; ?>
</div>
</div>
</form>

5
application/Linework/LineworkController.php
View File

@@ -210,8 +210,8 @@ class LineworkController extends mfBaseController {
$cmd = BASEDIR."/scripts/start_workflow_export.php";
$args = "";
$filter['type'] = "Pipework";
$filter['user_id'] = $this->me->id;
$get['filter']['type'] = "Linework";
$get['filter']['user_id'] = $this->me->id;
foreach($get['filter'] as $key => $value) {
$args .= " ".escapeshellarg("--$key")." ". escapeshellarg($value);
@@ -219,6 +219,7 @@ class LineworkController extends mfBaseController {
$cmd = "$cmd --uid ". escapeshellarg($uid)." $args >/dev/null 2>&1 &";
$this->log->debug($cmd);
exec($cmd);
// return progress