Fixed Voicenumber and Updated Voiceplan

Layout/default/Voicenumberblock/Form.php

@@ -40,7 +40,7 @@
                     <label class="col-lg-2 col-form-label" for="countrycode">Country Code *</label>
                     <div class="col-lg-10">
                       <input type="countrycode" class="form-control" name="countrycode" id="countrycode" value="<?=$block->countrycode?>" />
-                      <small>43</small>
+                      <small class="font-italic">Beispiel: 43</small>
                     </div>
                   </div>
 
@@ -48,23 +48,23 @@
                     <label class="col-lg-2 col-form-label" for="areacode">Area Code *</label>
                     <div class="col-lg-10">
                       <input type="text" class="form-control" name="areacode" id="areacode" value="<?=$block->areacode?>" />
-                      <small>3115</small>
+                      <small class="font-italic">Beispiel: 3115</small>
                     </div>
                   </div>
                   
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="first">Erste Nummer *</label>
                     <div class="col-lg-10">
-                      <input type="text" class="form-control" name="first" id="first" value="<?=($block->id) ? $block->getFirst() : ""?>" />
-                      <small>4080010</small>
+                      <input type="text" class="form-control" name="first" id="first" value="<?=($block->id) ? $block->short_first : ""?>" />
+                      <small class="font-italic">Beispiel: 4080010</small>
                     </div>
                   </div>
                   
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="last">Letzte Nummer *</label>
                     <div class="col-lg-10">
-                      <input type="text" class="form-control" name="last" id="last" value="<?=($block->id) ? $block->getLast() : ""?>" />
-                      <small>4080099</small>
+                      <input type="text" class="form-control" name="last" id="last" value="<?=($block->id) ? $block->short_last : ""?>" />
+                      <small class="font-italic">Beispiel: 4080099</small>
                     </div>
                   </div>
                   

Layout/default/Voicenumberblock/Index.php

@@ -101,6 +101,7 @@
                 <th>Landeskennzahl</th>
                 <th>Ortskennzahl</th>
                 <th>Nummernbasis</th>
+                <th>Anzahl Rufnummern</th>
                 <th>Anfang</th>
                 <th>Ende</th>
                 <th>Kommentar</th>
@@ -111,7 +112,8 @@
                 <td onclick="toggleBlock(<?=$block->id?>)"><?=$block->name?></td>
                 <td onclick="toggleBlock(<?=$block->id?>)"><?=$block->countrycode?></td>
                 <td onclick="toggleBlock(<?=$block->id?>)"><?=$block->areacode?></td>
-                <td onclick="toggleBlock(<?=$block->id?>)"><?=$block->short_prefix?></td>
+                <td onclick="toggleBlock(<?=$block->id?>)"><?=$block->prefix?></td>
+                <td onclick="toggleBlock(<?=$block->id?>)"><?=number_format($block->last - $block->first + 1, 0, ",",".")?></td>
                 <td onclick="toggleBlock(<?=$block->id?>)"><?=$block->first?></td>
                 <td onclick="toggleBlock(<?=$block->id?>)"><?=$block->last?></td>
                 <td onclick="toggleBlock(<?=$block->id?>)"><?=$block->comment?></td>

Layout/default/Voiceplan/Form.php

@@ -43,17 +43,17 @@
                     </div>
                   </div>
                   
-                  <!--div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="name">Taktung *</label>
+                  <div class="form-group row">
+                    <label class="col-lg-2 col-form-label" for="name">Standardtaktung *</label>
                     <div class="col-lg-10">
                       <input type="increment" class="form-control" name="increment" id="increment" value="<?=($plan->increment_first && $plan->increment) ? $plan->increment_first."/".$plan->increment : ""?>" placeholder="60/30" />
                     </div>
-                  </div-->
+                  </div>
                   
                   <hr />
                   
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="first">Zonen und Destinationen aus bestehendem Tarifpaket kopieren</label>
+                    <label class="col-lg-2 col-form-label" for="copy_from_plan_id">Zonen und Destinationen aus bestehendem Tarifpaket kopieren</label>
                     <div class="col-lg-10">
                       <select name="copy_from_plan_id" class="form-control">
                         <option value=""></option>
@@ -65,11 +65,17 @@
                   </div>
                   
                   <div class="form-group row">
-                    <label class="col-lg-2 col-form-label" for="first">oder Zonen und Destinationen neu importieren</label>
+                    <label class="col-lg-2 col-form-label">oder Zonen und Destinationen neu importieren</label>
                     <div class="col-lg-10">
-                      Zonen File: <input type="file" class="form-control" name="voiceplanzonefile" />
-                      Destinations File: <input type="file" class="form-control" name="voiceplandestinationfile" />
-                      <?php if($voiceplan->id): ?><small class="text-danger">ACHTUNG: Bestehende Zonen und Destinationen werden gelöscht!</small><?php endif; ?>
+                      <div class="mb-1">
+                        Zonenpreis File: <input type="file" class="form-control" name="voiceplanzonefile" />
+                        <small>Zone, ZoneID, Zeitzone, ZeitzoneID, Default price, ZZSpr, ZZSprID, Sonderpreis</small>
+                      </div>
+                      <div>
+                        Destinations File: <input type="file" class="form-control" name="voiceplandestinationfile" />
+                        <?php if($voiceplan->id): ?><small class="text-danger">ACHTUNG: Bestehende Zonen und Destinationen werden gelöscht!</small><?php endif; ?>
+                        <small>ZoneID, Text, Prefix</small>
+                      </div>
                     </div>
                     
                   </div>

Layout/default/Voiceplan/Index.php

@@ -70,6 +70,7 @@
                 <th>Beschreibung</th>
                 <th>Anzahl Tarifzonen</th>
                 <th>Anzahl Destinations</th>
+                <th>Standardtaktung</th>
                 <th>Erstellt</th>
                 <th></th>
               </tr>
@@ -79,6 +80,7 @@
                 <td><?=$plan->description?></td>
                 <td><?=count($plan->zones)?></td>
                 <td><?=count($plan->destinations)?></td>
+                <td><?=($plan->increment_first && $plan->increment) ? $plan->increment_first."/".$plan->increment : ""?></td>
                 <td><?=date("d.m.Y H:i", $plan->create)?> (<?=$plan->creator->name?>)</td>
                 <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
                   <a href="<?=self::getUrl("Voiceplan", "view", ["id" => $plan->id])?>"><i class="far fa-eyes"  title="Anzeigen"></i></a>

Layout/default/Voiceplan/View.php

@@ -44,7 +44,7 @@
             <table class="table table-striped table-hover">
               <tr>
                 <th>Zone</th>
-                <th>Anzahl Prefixes</th>
+                <th>Destination(s)</th>
                 <th>Taktung</th>
                 <th>Einkaufspreis</th>
                 <th>Verkaufspreis</th>
@@ -55,7 +55,7 @@
               <?php foreach($zones as $zone): ?>
               <tr>
                 <td><a href="<?=self::getUrl("Voiceplanzone", "view", ["id" => $zone->id])?>"><?=$zone->name?></a></td>
-                <td><?=count($zone->destinations)?></td>
+                <td><?=(count($zone->destinations) > 1) ? count($zone->destinations) : "<spam class='text-monospace'>+".$zone->destinations[0]->prefix."</span>"?></td>
                 <td><?=($zone->increment_first && $zone->increment) ? $zone->increment_first."/".$zone->increment : ""?></td>
                 <td><?=$zone->purchase_price?></td>
                 <td><?=$zone->price?></td>

Layout/default/Voiceplanzone/View.php

@@ -57,8 +57,8 @@
                 <td><?=date("d.m.Y H:i", $zone->create)?> (<?=$zone->creator->name?>)</td>
                 <td><?=date("d.m.Y H:i", $zone->edit)?> (<?=$zone->editor->name?>)</td>
                 <td style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
-                  <a href="<?=self::getUrl("Voiceplanzone", "edit", ["id" => $zone->id])?>"><i class="far fa-edit"  title="Zone bearbeiten"></i></a>
-                  <a href="<?=self::getUrl("Voiceplanzone", "delete", ["id" => $zone->id])?>" onclick="if(!confirm('Tarifzone wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
+                  <a href="<?=self::getUrl("Voiceplandestination", "edit", ["id" => $destination->id])?>"><i class="far fa-edit"  title="Zone bearbeiten"></i></a>
+                  <a href="<?=self::getUrl("Voiceplandestination", "delete", ["id" => $destination->id])?>" onclick="if(!confirm('Destination wirklich löschen?')) return false;" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
                 </td>
               </tr>
               <?php endforeach; ?>