From: Sam Link <slink@LIBPC002>
Date: Wed, 1 Aug 2018 16:26:12 +0000 (-0400)
Subject: LP#1722383 - Sorting the Workstation Dropdowns
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=8f9ce82868ca958c8178fef081b6e1e25a52b245;p=working%2FEvergreen.git

LP#1722383 - Sorting the Workstation Dropdowns

Changes to both Evergreen/Open-ILS/src/templates/staff/t_login.tt2 and
Evergreen/Open-ILS/src/templates/staff/t_workstations.tt2 in an effort
to alphabetically sort the workstation names. This is an initial commit
of this possible fix for testing.
---

diff --git a/Open-ILS/src/edi_translator/data/test_output/perl_json2edi.tmp b/Open-ILS/src/edi_translator/data/test_output/perl_json2edi.tmp
deleted file mode 100644
index a88c678f35..0000000000
--- a/Open-ILS/src/edi_translator/data/test_output/perl_json2edi.tmp
+++ /dev/null
@@ -1,79 +0,0 @@
-
-{
- "msgtype: "ORDERS",
- "msg": ["order", {
-    "po_number":6,
-    "date":"20100301",
-    "buyer":[
-        {"id":"6666666",
-         "reference":{"API":"6666666"}}
-    ],
-    "vendor":[         "0672891",
-        {"id-qualifier":"91", "reference":{"IA":"1"}, "id":"0672891"}
-    ],
-    "currency":"USD",
-    "items":[
-        
-        {
-            "identifiers":[
-                {"id-qualifier":"SA","id":"38"},
-                {"id-qualifier":"IB","id":""}
-            ],
-            "price":9.99,
-            "desc":[
-                {"BTI":"Twilight zone/twilight tone / arr. Paul Jennings"}, 
-                {"BPU":"Jenson Publications,"},
-                {"BPD":"1982, c1979"},
-                {"BPH":"1 score + parts"}
-            ],
-            "quantity":4        },
-        
-        {
-            "identifiers":[
-                {"id-qualifier":"SA","id":"40"},
-                {"id-qualifier":"IB","id":"0393048799"}
-            ],
-            "price":16.44,
-            "desc":[
-                {"BTI":"The twilight of American culture / Morris Berman."}, 
-                {"BPU":"Norton,"},
-                {"BPD":"c2000."},
-                {"BPH":"xiv, 205 p. ;"}
-            ],
-            "quantity":3        },
-        
-        {
-            "identifiers":[
-                {"id-qualifier":"SA","id":"27"},
-                {"id-qualifier":"IB","id":"0439139597"}
-            ],
-            "price":14.99,
-            "desc":[
-                {"BTI":"Harry Potter and the goblet of fire / by J.K. Rowling ; illustrations by Mary GrandPr\u00e9."}, 
-                {"BPU":"Arthur A. Levine Books,"},
-                {"BPD":"c2000."},
-                {"BPH":"xi, 734 p. :"}
-            ],
-            "quantity":19        },
-        
-        {
-            "identifiers":[
-                {"id-qualifier":"SA","id":"30"},
-                {"id-qualifier":"IB","id":"0786222735"}
-            ],
-            "price":15.99,
-            "desc":[
-                {"BTI":"Harry Potter and the Chamber of Secrets / J.K. Rowling ; illustrations by Mary GrandPr\u00e9."}, 
-                {"BPU":"Thorndike Press,"},
-                {"BPD":"1999."},
-                {"BPH":"464 p. ; 22 cm."}
-            ],
-            "quantity":4        }
-        
-    ],
-    "line_items":4
- }],
- "recipient":"0672891",
- "sender":"6666666"
-}
-
diff --git a/Open-ILS/src/edi_translator/data/test_output/ruby_json2edi.tmp b/Open-ILS/src/edi_translator/data/test_output/ruby_json2edi.tmp
deleted file mode 100644
index fc0ee39a49..0000000000
--- a/Open-ILS/src/edi_translator/data/test_output/ruby_json2edi.tmp
+++ /dev/null
@@ -1,78 +0,0 @@
-
-{
- "msg_type": "ORDERS",
- "msg": ["order", {
-    "po_number":6,
-    "date":"20100301",
-    "buyer":[
-        {"id":"6666666",
-         "reference":{"API":"6666666"}}
-    ],
-    "vendor":[         "0672891",
-        {"id-qualifier":"91", "reference":{"IA":"1"}, "id":"0672891"}
-    ],
-    "currency":"USD",
-    "items":[
-        
-        {
-            "identifiers":[
-                {"id-qualifier":"SA","id":"38"},
-                {"id-qualifier":"IB","id":""}
-            ],
-            "price":9.99,
-            "desc":[
-                {"BTI":"Twilight zone/twilight tone / arr. Paul Jennings"}, 
-                {"BPU":"Jenson Publications,"},
-                {"BPD":"1982, c1979"},
-                {"BPH":"1 score + parts"}
-            ],
-            "quantity":4        },
-        
-        {
-            "identifiers":[
-                {"id-qualifier":"SA","id":"40"},
-                {"id-qualifier":"IB","id":"0393048799"}
-            ],
-            "price":16.44,
-            "desc":[
-                {"BTI":"The twilight of American culture / Morris Berman."}, 
-                {"BPU":"Norton,"},
-                {"BPD":"c2000."},
-                {"BPH":"xiv, 205 p. ;"}
-            ],
-            "quantity":3        },
-        
-        {
-            "identifiers":[
-                {"id-qualifier":"SA","id":"27"},
-                {"id-qualifier":"IB","id":"0439139597"}
-            ],
-            "price":14.99,
-            "desc":[
-                {"BTI":"Harry Potter and the goblet of fire / by J.K. Rowling ; illustrations by Mary GrandPr\u00e9."}, 
-                {"BPU":"Arthur A. Levine Books,"},
-                {"BPD":"c2000."},
-                {"BPH":"xi, 734 p. :"}
-            ],
-            "quantity":19        },
-        
-        {
-            "identifiers":[
-                {"id-qualifier":"SA","id":"30"},
-                {"id-qualifier":"IB","id":"0786222735"}
-            ],
-            "price":15.99,
-            "desc":[
-                {"BTI":"Harry Potter and the Chamber of Secrets / J.K. Rowling ; illustrations by Mary GrandPr\u00e9."}, 
-                {"BPU":"Thorndike Press,"},
-                {"BPD":"1999."},
-                {"BPH":"464 p. ; 22 cm."}
-            ],
-            "quantity":4        }
-        
-    ],
-    "line_items":4
- }],
- "recipient":"0672891",
- "sender":"6666666"
-}
diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2
index 6210395f48..04008788b3 100644
--- a/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2
+++ b/Open-ILS/src/templates/staff/admin/workstation/t_workstations.tt2
@@ -47,7 +47,7 @@
   <div class="row">
     <div class="col-md-6">
       <select class="form-control" ng-model="selectedWS">
-        <option ng-repeat="ws in workstations" value="{{ws}}"
+        <option ng-repeat="ws in workstations | orderBy: 'name'" value="{{ws}}"
           ng-selected="ws == selectedWS">
           {{get_ws_label(ws)}}
         </option>
diff --git a/Open-ILS/src/templates/staff/t_login.tt2 b/Open-ILS/src/templates/staff/t_login.tt2
index e4d42cb30f..1d777e6957 100644
--- a/Open-ILS/src/templates/staff/t_login.tt2
+++ b/Open-ILS/src/templates/staff/t_login.tt2
@@ -34,7 +34,7 @@
                 for="login-workstation">[% l('Workstation') %]</label>
               <div class="col-md-8">
                 <select class="form-control" ng-model="args.workstation"
-                  ng-options="ws for ws in workstations">
+                  ng-options="ws for ws in workstations | orderBy: 'name'">
                   <option>[% l('Select Workstation') %]</option>
                 </select>
               </div>