From d20e462652177633ff47f4632ecf83158541f565 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 4 Jun 2024 16:36:39 -0400 Subject: [PATCH] Mimicked UI for Client Perms to USer and Device Licneses under Licenses --- client_software_add_modal.php | 108 +++++++++++++++++++++------------ client_software_edit_modal.php | 27 ++++++--- 2 files changed, 87 insertions(+), 48 deletions(-) diff --git a/client_software_add_modal.php b/client_software_add_modal.php index 82b95e03..25b67c22 100644 --- a/client_software_add_modal.php +++ b/client_software_add_modal.php @@ -18,6 +18,12 @@ + + @@ -133,53 +139,79 @@ -
- -
-
- +
+ +
+ +
    + +
  • +
    + +
    - -
-
+ while ($row = mysqli_fetch_array($sql_assets_select)) { + $asset_id_select = intval($row['asset_id']); + $asset_name_select = nullable_htmlentities($row['asset_name']); + $asset_type_select = nullable_htmlentities($row['asset_type']); + $asset_archived_at = nullable_htmlentities($row['asset_archived_at']); + if (empty($asset_archived_at)) { + $asset_archived_display = ""; + } else { + $asset_archived_display = "Archived - "; + } + $contact_name_select = nullable_htmlentities($row['contact_name']); -
- -
-
- + ?> +
  • +
    + + +
    +
  • + + + + + +
    + +
    + +
      + +
    • +
      + +
      - -
    -
    + ?> +
  • +
    + + +
    +
  • + + + +
    diff --git a/client_software_edit_modal.php b/client_software_edit_modal.php index fcae235d..96eb6617 100644 --- a/client_software_edit_modal.php +++ b/client_software_edit_modal.php @@ -143,12 +143,16 @@
    -
    - Select Assets that are licensed for this software -
    -
      +
    • +
      + + +
      +
    • + + '$software_created_at' OR asset_archived_at IS NULL) AND asset_client_id = $client_id ORDER BY asset_archived_at ASC, asset_name ASC"); @@ -167,7 +171,7 @@ ?>
    • - > + >
    • @@ -180,12 +184,15 @@
      -
      - Select Users that are licensed for this software -
      -
        +
      • +
        + + +
        +
      • + '$software_created_at' OR contact_archived_at IS NULL) AND contact_client_id = $client_id ORDER BY contact_archived_at ASC, contact_name ASC"); @@ -203,7 +210,7 @@ ?>
      • - > + >