diff --git a/app/devices/app_config.php b/app/devices/app_config.php index a444442fb8..7eb737b518 100644 --- a/app/devices/app_config.php +++ b/app/devices/app_config.php @@ -363,6 +363,21 @@ $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "phone_description"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; + $z++; + $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "device_provisioned_date"; + $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "device_provisioned_date"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "datetime"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; + $z++; + $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "device_provisioned_method"; + $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "device_provisioned_method"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; + $z++; + $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "device_provisioned_ip"; + $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "device_provisioned_ip"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; $y = 1; //table array index $z = 0; //field array index diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php index f7ed48501e..7fb5e51cf5 100644 --- a/app/devices/app_languages.php +++ b/app/devices/app_languages.php @@ -1414,6 +1414,16 @@ $text['label-device_description']['de-at'] = "Beschreibung"; $text['label-device_description']['ar-eg'] = ""; $text['label-device_description']['he'] = "תאור"; +$text['label-device_status']['en-us'] = "Status"; +$text['label-device_status']['es-cl'] = "Estado"; +$text['label-device_status']['pt-pt'] = "Estado"; +$text['label-device_status']['fr-fr'] = "Statut"; +$text['label-device_status']['pt-br'] = "Estado"; +$text['label-device_status']['pl'] = "Status "; +$text['label-device_status']['sv-se'] = "Status"; +$text['label-device_status']['uk'] = "Стан"; +$text['label-device_status']['de-at'] = "Status"; + $text['label-device']['en-us'] = "Device"; $text['label-device']['es-cl'] = "Dispositivo"; $text['label-device']['pt-pt'] = "Dispositivo"; diff --git a/app/devices/devices.php b/app/devices/devices.php index 5f9a775fc1..59d8355a2e 100644 --- a/app/devices/devices.php +++ b/app/devices/devices.php @@ -88,6 +88,8 @@ $sql .= " or d.device_enabled like '%".$search."%' "; $sql .= " or d.device_template like '%".$search."%' "; $sql .= " or d.device_description like '%".$search."%' "; + $sql .= " or d.device_provisioned_method like '%".$search."%' "; + $sql .= " or d.device_provisioned_ip like '%".$search."%' "; $sql .= ") "; } $prep_statement = $db->prepare($sql); @@ -139,6 +141,8 @@ $sql .= " or d.device_enabled like '%".$search."%' "; $sql .= " or d.device_template like '%".$search."%' "; $sql .= " or d.device_description like '%".$search."%' "; + $sql .= " or d.device_provisioned_method like '%".$search."%' "; + $sql .= " or d.device_provisioned_ip like '%".$search."%' "; $sql .= ") "; } if (strlen($order_by) == 0) { @@ -214,6 +218,7 @@ echo th_order_by('device_vendor', $text['label-device_vendor'], $order_by, $order); echo th_order_by('device_template', $text['label-device_template'], $order_by, $order); echo th_order_by('device_enabled', $text['label-device_enabled'], $order_by, $order); + echo th_order_by('device_status', $text['label-device_status'], $order_by, $order); echo th_order_by('device_description', $text['label-device_description'], $order_by, $order); echo "