Commit baa071c3 by Takumi Imai

Merge branch 'feature/1.0_check_web_dev_50298' into 'feature/1.0_check_web_dev'

Feature/1.0 check web dev 50298

See merge request !54
parents ff062f69 01de0476
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<div id="includedMainTitle"></div> <div id="includedMainTitle"></div>
<!-- sub title --> <!-- sub title -->
<h2 class="fs-8 font-weight-bold lang" id="#pickupHeader" lang="pickup"></h2> <h2 class="fs-8 font-weight-bold lang" id="pickupHeader" lang="pickup"></h2>
<!-- card --> <!-- card -->
<ul class="dashboard-menu p-0 mt-3 d-grid col-gap-10 grid-col-md-4 grid-col-2" id ="pickupItems" > <ul class="dashboard-menu p-0 mt-3 d-grid col-gap-10 grid-col-md-4 grid-col-2" id ="pickupItems" >
......
...@@ -73,6 +73,14 @@ OperationSelect.init = function (selectedCallback) { ...@@ -73,6 +73,14 @@ OperationSelect.init = function (selectedCallback) {
*/ */
OperationSelect.createOperationSelectList = function (operationList) { OperationSelect.createOperationSelectList = function (operationList) {
$('#operationSelectList').empty(); $('#operationSelectList').empty();
// sort operation list by operationId
operationList = operationList.sort(function (a, b) {
if (a.operationId < b.operationId) return 1;
if (a.operationId > b.operationId) return -1;
return 0;
});
if (typeof operationList === 'undefined' || operationList.length < 1) return; if (typeof operationList === 'undefined' || operationList.length < 1) return;
for (let i = 0; i < operationList.length; i++) { for (let i = 0; i < operationList.length; i++) {
let messageli = $("<li class='card mb-2' name = 'operationId_" + operationList[i].operationId + "' ></li>"); let messageli = $("<li class='card mb-2' name = 'operationId_" + operationList[i].operationId + "' ></li>");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment