diff --git a/Layout/default/Voicenumberblock/Form.php b/Layout/default/Voicenumberblock/Form.php index 98fbf1180..7aed72bab 100644 --- a/Layout/default/Voicenumberblock/Form.php +++ b/Layout/default/Voicenumberblock/Form.php @@ -55,7 +55,7 @@
- + " /> 4080010
@@ -63,7 +63,7 @@
- + " /> 4080099
diff --git a/Layout/default/Voicenumberblock/Index.php b/Layout/default/Voicenumberblock/Index.php index 3a9a834ad..95fbdfd62 100644 --- a/Layout/default/Voicenumberblock/Index.php +++ b/Layout/default/Voicenumberblock/Index.php @@ -123,19 +123,25 @@ - - name?> - countrycode?> - areacode?> - base?> - getFirst()?> - getLast()?> - comment?> + + name?> + countrycode?> + areacode?> + base?> + getFirst()?> + getLast()?> + comment?> $block->id])?>"> $block->id])?>" onclick="if(!confirm('Rufnummernblock wirklich löschen?')) return false;" class="text-danger" title="Löschen"> + + + + + + @@ -175,4 +181,16 @@ + \ No newline at end of file diff --git a/Layout/default/Voicenumberblock/include/block-detail.php b/Layout/default/Voicenumberblock/include/block-detail.php new file mode 100644 index 000000000..4fe596fab --- /dev/null +++ b/Layout/default/Voicenumberblock/include/block-detail.php @@ -0,0 +1,44 @@ + +
+
+

Rufnummern countrycode?>areacode?>getFirst()?> - countrycode?>areacode?>getLast()?>

+ + + + + + + + + + getFirst(), $block->getLast()) as $number): ?> + $block_id, 'number' => ($block->number_prepend_zero) ? "0$number" : $number]) ?> + + + + + + + + + = 100) break; ?> + +
NummerAktivRoutingPortierungsstatusSperreEntsperrung
countrycode?> areacode?> number_prepend_zero) ? "0" : ""?> + active): ?> + + (seit id) ? date("d.m.Y H:i:s", $num->activated_date) : ""?>) + + + + routing?> + ported_out): ?> + Exportiert + (id) ? date("d.m.Y H:i:s", $num->port_out_date) : ""?>) + + Lokal + + disabled_reason?>id && $num->enable_on_date) ? date("d.m.Y", $num->enable_on_date) : ""?>
+
+
\ No newline at end of file diff --git a/application/Voicenumber/VoicenumberModel.php b/application/Voicenumber/VoicenumberModel.php index ea37db5ec..9dbf7d846 100644 --- a/application/Voicenumber/VoicenumberModel.php +++ b/application/Voicenumber/VoicenumberModel.php @@ -52,10 +52,11 @@ class VoicenumberModel { } - public static function getFirst() { + public static function getFirst($filter = null) { $db = FronkDB::singleton(); $where = self::getSqlFilter($filter); + mfLoghandler::singleton()->debug($where); $res = $db->select("Voicenumber", "*", "$where ORDER BY voicenumberblock_id, number"); if($db->num_rows($res)) { $data = $db->fetch_object($res); @@ -137,41 +138,6 @@ class VoicenumberModel { } } - if(array_key_exists("first", $filter)) { - $add_zero = false; - $first = $filter['first']; - - mfLoghandler::singleton()->debug($first); - - if(substr($first,0, 1) === "0") { - $add_zero = true; - $first = substr($first, 1); - } - - if(is_numeric($first)) { - $where .= " AND first like '%$first%'"; - if($add_zero) { - $where .= " AND number_prepend_zero = 1"; - } - } - } - - if(array_key_exists("last", $filter)) { - $add_zero = false; - $last = $filter['last']; - - mfLoghandler::singleton()->debug($last); - - if(substr($last,0, 1) === "0") { - $add_zero = true; - $last = substr($last, 1); - } - - if(is_numeric($last)) { - $where .= " AND last like '%$last%'"; - } - } - if(array_key_exists("number", $filter)) { $add_zero = false; $number = $filter['number']; @@ -183,7 +149,7 @@ class VoicenumberModel { $number = substr($number, 1); } if(is_numeric($number)) { - $where .= " AND first <= $number AND last >= $number"; + $where .= " AND number = $number"; if($add_zero) { $where .= " AND number_prepend_zero = 1"; @@ -191,13 +157,6 @@ class VoicenumberModel { } } - if(array_key_exists("name", $filter)) { - $name = $db->escape($filter['name']); - if($name) { - $where .= " AND name like '%$name%'"; - } - } - if(array_key_exists("comment", $filter)) { $comment = $db->escape($filter['comment']); if($comment) {