From facd35a717ecb0b5b571b4c93fc9642a951aa7bf Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 30 Apr 2019 11:10:00 -0500 Subject: [PATCH 1/8] REF-72 --- api/sta/objects/status.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api/sta/objects/status.php b/api/sta/objects/status.php index caaabc7..d15a12d 100644 --- a/api/sta/objects/status.php +++ b/api/sta/objects/status.php @@ -18,7 +18,7 @@ public function __construct($db){ } public function getStatus() { - $sql = "SELECT FK_locAIDPhysical, FK_resAID, FK_noteAID, FK_userID, FK_deptID, FK_locAIDCovering FROM $this->table_name"; + $sql = "SELECT FK_locAIDPhysical, FK_resAID, FK_noteAID, FK_userID, FK_deptID, FK_locAIDCovering FROM $this->table_name ORDER BY stsStartTime DESC"; $query = $this->conn->query($sql); return $query; } @@ -35,6 +35,7 @@ public function getByCovering($nameQuery) { for($index = 1; $indexconn->query($sql); return $query; } @@ -52,12 +53,13 @@ public function getByLocation($nameQuery) { for($index = 1; $indexconn->query($sql); return $query; } public function getByDepartment($nameQuery) { - $sql = "SELECT FK_locAIDPhysical, FK_resAID, FK_noteAID, FK_userID, FK_deptID, FK_locAIDCovering FROM $this->table_name WHERE FK_deptID='$nameQuery'"; + $sql = "SELECT FK_locAIDPhysical, FK_resAID, FK_noteAID, FK_userID, FK_deptID, FK_locAIDCovering FROM $this->table_name WHERE FK_deptID='$nameQuery' ORDER BY stsStartTime DESC"; $query = $this->conn->query($sql); return $query; } From eeb4c52daa25796cf9cdc4d45722c630ae53ae6f Mon Sep 17 00:00:00 2001 From: jmlundahl Date: Tue, 30 Apr 2019 11:16:08 -0500 Subject: [PATCH 2/8] Moved to status folder --- .../create_eresources_a-z_static.php | 0 .../journals-articles/database-list/index.php | 0 .../eresource-news/index.php | 0 .../journals-articles/eresources_a-z.php | 0 .../google_scholar_workaround.php | 0 .../journals-articles/index.php | 0 .../journals-articles/journal-search.php | 0 departments/reference/desk/refDeskStatus.php | 12 +-- .../desk/{ => status}/info_on_call.php | 80 +++++++++---------- .../desk/{ => status}/info_student.php | 30 +++---- .../reference/desk/{ => status}/no_staff.php | 48 +++++------ .../reference/desk/{ => status}/on_call.php | 58 +++++++------- .../reference/desk/{ => status}/staffed.php | 58 +++++++------- 13 files changed, 143 insertions(+), 143 deletions(-) rename departments/{reference => }/journals-articles/create_eresources_a-z_static.php (100%) rename departments/{reference => }/journals-articles/database-list/index.php (100%) rename departments/{reference => }/journals-articles/eresource-news/index.php (100%) rename departments/{reference => }/journals-articles/eresources_a-z.php (100%) rename departments/{reference => }/journals-articles/google_scholar_workaround.php (100%) rename departments/{reference => }/journals-articles/index.php (100%) rename departments/{reference => }/journals-articles/journal-search.php (100%) rename departments/reference/desk/{ => status}/info_on_call.php (97%) rename departments/reference/desk/{ => status}/info_student.php (97%) rename departments/reference/desk/{ => status}/no_staff.php (97%) rename departments/reference/desk/{ => status}/on_call.php (97%) rename departments/reference/desk/{ => status}/staffed.php (97%) diff --git a/departments/reference/journals-articles/create_eresources_a-z_static.php b/departments/journals-articles/create_eresources_a-z_static.php similarity index 100% rename from departments/reference/journals-articles/create_eresources_a-z_static.php rename to departments/journals-articles/create_eresources_a-z_static.php diff --git a/departments/reference/journals-articles/database-list/index.php b/departments/journals-articles/database-list/index.php similarity index 100% rename from departments/reference/journals-articles/database-list/index.php rename to departments/journals-articles/database-list/index.php diff --git a/departments/reference/journals-articles/eresource-news/index.php b/departments/journals-articles/eresource-news/index.php similarity index 100% rename from departments/reference/journals-articles/eresource-news/index.php rename to departments/journals-articles/eresource-news/index.php diff --git a/departments/reference/journals-articles/eresources_a-z.php b/departments/journals-articles/eresources_a-z.php similarity index 100% rename from departments/reference/journals-articles/eresources_a-z.php rename to departments/journals-articles/eresources_a-z.php diff --git a/departments/reference/journals-articles/google_scholar_workaround.php b/departments/journals-articles/google_scholar_workaround.php similarity index 100% rename from departments/reference/journals-articles/google_scholar_workaround.php rename to departments/journals-articles/google_scholar_workaround.php diff --git a/departments/reference/journals-articles/index.php b/departments/journals-articles/index.php similarity index 100% rename from departments/reference/journals-articles/index.php rename to departments/journals-articles/index.php diff --git a/departments/reference/journals-articles/journal-search.php b/departments/journals-articles/journal-search.php similarity index 100% rename from departments/reference/journals-articles/journal-search.php rename to departments/journals-articles/journal-search.php diff --git a/departments/reference/desk/refDeskStatus.php b/departments/reference/desk/refDeskStatus.php index da1e18f..920ce29 100644 --- a/departments/reference/desk/refDeskStatus.php +++ b/departments/reference/desk/refDeskStatus.php @@ -95,22 +95,22 @@ function timestamp() { switch ($refDeskState) { case 'staffed': - include_once('./staffed.php'); + include_once('./status/staffed.php'); break; case 'info_on_call': - include_once('./info_on_call.php'); + include_once('./status/info_on_call.php'); break; case 'info_student': - include_once('./info_student.php'); + include_once('./status/info_student.php'); break; case 'on_call': - include_once('./on_call.php'); + include_once('./status/on_call.php'); break; case 'no_staff': - include_once('./no_staff.php'); + include_once('./status/no_staff.php'); break; default: - include_once('./no_staff.php'); + include_once('./status/no_staff.php'); break; } diff --git a/departments/reference/desk/info_on_call.php b/departments/reference/desk/status/info_on_call.php similarity index 97% rename from departments/reference/desk/info_on_call.php rename to departments/reference/desk/status/info_on_call.php index 4aa02d6..48a30de 100644 --- a/departments/reference/desk/info_on_call.php +++ b/departments/reference/desk/status/info_on_call.php @@ -1,40 +1,40 @@ - -
-
-
Currently staffed by
- graphic -

Informatics Student

-

815-939-5355

-

- Informatic Students can assist you with printing needs and minor technology needs. - They can either contact an on call reference staff member to help you with research or take a message. -

-
- -
-
On Call
- Reference Staff
- "; - echo ""; - } else { - echo ""; - } - ?> -

-

- " ?> - email - - | -

-

- Even though the reference staff member is not physically at the desk currently. - He or she is on call. - This means that you can contact him/her by ONU email or phone. - He/she will also be happy to meet you at the reference desk, just ask a student - at one of the service desks for help. -

-
-
+ +
+
+
Currently staffed by
+ graphic +

Informatics Student

+

815-939-5355

+

+ Informatic Students can assist you with printing needs and minor technology needs. + They can either contact an on call reference staff member to help you with research or take a message. +

+
+ +
+
On Call
+ Reference Staff
+ "; + echo ""; + } else { + echo ""; + } + ?> +

+

+ " ?> + email + + | +

+

+ Even though the reference staff member is not physically at the desk currently. + He or she is on call. + This means that you can contact him/her by ONU email or phone. + He/she will also be happy to meet you at the reference desk, just ask a student + at one of the service desks for help. +

+
+
diff --git a/departments/reference/desk/info_student.php b/departments/reference/desk/status/info_student.php similarity index 97% rename from departments/reference/desk/info_student.php rename to departments/reference/desk/status/info_student.php index 4f075cc..4a0065d 100644 --- a/departments/reference/desk/info_student.php +++ b/departments/reference/desk/status/info_student.php @@ -1,15 +1,15 @@ -
-
- graphic -
- -
-
Currently staffed by
-

Informatics Student

-

815-939-5355

-

- Informatic students can assist you with printing needs and minor technology needs. - They can take a message. -

-
-
+
+
+ graphic +
+ +
+
Currently staffed by
+

Informatics Student

+

815-939-5355

+

+ Informatic students can assist you with printing needs and minor technology needs. + They can take a message. +

+
+
diff --git a/departments/reference/desk/no_staff.php b/departments/reference/desk/status/no_staff.php similarity index 97% rename from departments/reference/desk/no_staff.php rename to departments/reference/desk/status/no_staff.php index 2048d47..75d6d46 100644 --- a/departments/reference/desk/no_staff.php +++ b/departments/reference/desk/status/no_staff.php @@ -1,24 +1,24 @@ -
-
- - graphic - -
- -
-
Reference Desk is not currently staffed
-

Email a Library Staff member for assistance

-

- - email - - | 815-939-5355 -

-

- Even though there is no one currently staffing the reference desk, - our website is open 24/7. - Go to the Help tab on the homepage for self-help links or use the email - link above to contact a staff member who will return your email within 48 hours. -

-
-
+
+
+ + graphic + +
+ +
+
Reference Desk is not currently staffed
+

Email a Library Staff member for assistance

+

+ + email + + | 815-939-5355 +

+

+ Even though there is no one currently staffing the reference desk, + our website is open 24/7. + Go to the Help tab on the homepage for self-help links or use the email + link above to contact a staff member who will return your email within 48 hours. +

+
+
diff --git a/departments/reference/desk/on_call.php b/departments/reference/desk/status/on_call.php similarity index 97% rename from departments/reference/desk/on_call.php rename to departments/reference/desk/status/on_call.php index 133f08f..e73cb9c 100644 --- a/departments/reference/desk/on_call.php +++ b/departments/reference/desk/status/on_call.php @@ -1,29 +1,29 @@ -
-
- "; - echo ""; - } else { - echo ""; - } ?> -
- -
-
On Call
- Reference Staff
-

-

- " ?> - email - - | -

-

- Even though the reference staff member is not physically at the desk currently. - He or she is on call. - This means that you can contact him/her by ONU email or phone. - He/she will also be happy to meet you at the reference desk, just ask a student - at one of the service desks for help. -

-
-
+
+
+ "; + echo ""; + } else { + echo ""; + } ?> +
+ +
+
On Call
+ Reference Staff
+

+

+ " ?> + email + + | +

+

+ Even though the reference staff member is not physically at the desk currently. + He or she is on call. + This means that you can contact him/her by ONU email or phone. + He/she will also be happy to meet you at the reference desk, just ask a student + at one of the service desks for help. +

+
+
diff --git a/departments/reference/desk/staffed.php b/departments/reference/desk/status/staffed.php similarity index 97% rename from departments/reference/desk/staffed.php rename to departments/reference/desk/status/staffed.php index 686dc82..f8a75f5 100644 --- a/departments/reference/desk/staffed.php +++ b/departments/reference/desk/status/staffed.php @@ -1,29 +1,29 @@ - -
-
- "; - echo ""; - } else { - echo ""; - } - ?> -
- -
-
Currently staffed by
-

-

- " ?> - email - - | 815-939-5355 -

-

- Our reference staff sit at the reference desk in order to assist with research and - library specific questions. - Please "interrupt" us. -

-
-
+ +
+
+ "; + echo ""; + } else { + echo ""; + } + ?> +
+ +
+
Currently staffed by
+

+

+ " ?> + email + + | 815-939-5355 +

+

+ Our reference staff sit at the reference desk in order to assist with research and + library specific questions. + Please "interrupt" us. +

+
+
From f58e1689978a1fb4eb2c1c904934629e1c0fb95e Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 30 Apr 2019 11:43:34 -0500 Subject: [PATCH 3/8] updated refresh time --- departments/reference/desk/refDeskStatus.php | 2 +- departments/reference/desk/status/info_on_call.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/departments/reference/desk/refDeskStatus.php b/departments/reference/desk/refDeskStatus.php index 920ce29..a42e91e 100644 --- a/departments/reference/desk/refDeskStatus.php +++ b/departments/reference/desk/refDeskStatus.php @@ -1,6 +1,6 @@