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

Status can be set on new building

Browse Source
This commit is contained in:
Frank Schubert
2021-08-05 21:05:28 +02:00
parent c300830a06
commit 2a4d5ac7d2
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Layout/default/Building/Form.php
View File

@@ -210,10 +210,10 @@
<div class="form-group row">
<label class="col-lg-2 col-form-label" for="status_id">Status</label>
<div class="col-lg-10">
<select class="select2 form-control " name="status_id" id="status_id" <?=(!$me->is("Admin")) ? "disabled='disabled'" : ""?>>
<select class="select2 form-control " name="status_id" id="status_id" <?=($building->id && !$me->is("Admin")) ? "disabled='disabled'" : ""?>>
<option></option>
<?php foreach($statuses as $status): ?>
<option value="<?=$status->id?>" <?=($building->status_id == $status->id) ? "selected='selected'" : ""?>><?=__($status->name)?></option>
<option value="<?=$status->id?>" <?=($building->status_id == $status->id) ? "selected='selected'" : ""?>><?=$status->code?> - <?=__($status->name."-b")?></option>
<?php endforeach; ?>
</select>
</div>

4
Layout/default/Building/Index.php
View File

@@ -54,7 +54,7 @@
<?=$building->zip?> <?=$building->city?>
</td>
<td onclick="toggleBuilding(<?=$building->id?>)"><?=$building->units?></td>
<td onclick="toggleBuilding(<?=$building->id?>)" class="text-monospace"><?=__($building->status->name)?></td>
<td onclick="toggleBuilding(<?=$building->id?>)" class="text-monospace"><?=__($building->status->name."-b")?></td>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
<a href="<?=self::getUrl("Building", "edit", ["id" => $building->id])?>"><i class="far fa-edit" title="Objekt Bearbeiten"></i></a>
<a href="<?=self::getUrl("Building", "delete", ["id" => $building->id])?>" class="text-danger" onclick="if(!confirm('Objekt wirklich löschen?')) return false;" title="Objekt Löschen"><i class="fas fa-trash"></i></a>
@@ -148,7 +148,7 @@
</div>
</td>
<td class="text-monospace"><?=__($term->status->name)?></td>
<td class="text-monospace"><?=__($term->status->name."-t")?></td>
<td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
<a href="<?=self::getUrl("Termination", "delete", ["id" => $term->id])?>" class="text-danger" onclick="if(!confirm('Objekt wirklich löschen?')) return false;" title="Objekt Löschen"><i class="fas fa-trash"></i></a>
</td>

2
application/Order/OrderController.php
View File

@@ -9,7 +9,7 @@ class OrderController extends mfBaseController {
$this->me = $me;
$this->layout()->set("me",$me);
if(!$me->isAdmin()) {
if(!$me->is(["Admin", "salespartner"])) {
$this->redirect("Dashboard");
}
}

13
lang/de.php
View File

@@ -21,6 +21,17 @@ $l['billing'] = "Verrechnungsadresse";
$l['business'] = "Business";
$l['residential'] = "Residential";
$l['created'] = "Erstellt";
$l['created-b'] = "Erstellt";
$l['planned-b'] = "Rohrplan vorhanden";
$l['assigned-b'] = "Bauauftrag zugeteilt";
$l['passed-b'] = "Rohr am Grundstück";
$l['connected-b'] = "Rohr im Haus";
$l['created-t'] = "Erstellt";
$l['planned-t'] = "Faserplan vorhanden";
$l['assigned-t'] = "Bauauftrag zugeteilt";
$l['passed-t'] = "Fasern im Gebäude";
$l['connected-t'] = "Passiv erschlossen";
$l['active-t'] = "Internetprodukt aktiv";
$lang['de'] = $l;