updates

Controllers/AuthApiController.cs

@@ -903,6 +903,7 @@ namespace QuotationMaker.Controllers
             string dept_uid = obj["dept_uid"].ToString();
             string mainItem_uid = obj["mainItem_uid"].ToString();
             string mainItem_name = obj["mainItem_name"].ToString();
+            
             string method = obj["method"].ToString();
 
             if (method == "") {
@@ -924,10 +925,13 @@ namespace QuotationMaker.Controllers
 
             if (method == "add")
             {
+                int mainItem_order = int.Parse(obj["mainItem_order"].ToString());
+
                 mainItem_uid = GlobalClass.CreateRandomCode(12);
                 mainItem newItem = new mainItem();
                 newItem.mainItem_name = mainItem_name;
                 newItem.mainItem_uid = mainItem_uid;
+                newItem.mainItem_order = mainItem_order;
                 newItem.dept_uid = dept_uid;
                 newItem.mainItem_lastmodify_uid = token.user_uid;
                 newItem.mainItem_createdate = DateTime.Now;
@@ -968,7 +972,10 @@ namespace QuotationMaker.Controllers
                     return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8");
                 }
 
+                int mainItem_order = int.Parse(obj["mainItem_order"].ToString());
+
                 editItem.mainItem_name = mainItem_name;
+                editItem.mainItem_order = mainItem_order;
                 editItem.mainItem_lastmodify_uid = token.user_uid;
                 editItem.mainItem_modifydate= DateTime.Now;
 
@@ -1020,7 +1027,7 @@ namespace QuotationMaker.Controllers
 
             string dept_uid = obj["dept_uid"].ToString();
 
-            ret.mainItems = conn.Query<mainItem>("select * from mainItem where dept_uid = @dept_uid", new { dept_uid = dept_uid }).ToList();
+            ret.mainItems = conn.Query<mainItem>("select * from mainItem where dept_uid = @dept_uid order by mainItem_order, mainItem_name", new { dept_uid = dept_uid }).ToList();
             ret.ret = "yes";
 
             return Content(JsonConvert.SerializeObject(ret), "application/json;charset=utf-8");

Modals/DbTableClass.cs

@@ -359,6 +359,7 @@ public class DbTableClass
         public string mainItem_uid { get; set; } = "";
         public string dept_uid { get; set; } = "";
         public string mainItem_name { get; set; } = "";
+        public int mainItem_order { get; set; } = 99;
         public DateTime mainItem_createdate { get; set; } = DateTime.Now;
         public DateTime mainItem_modifydate { get; set; } = DateTime.Now;
         public string mainItem_lastmodify_uid { get; set; } = "";

Views/Home/ProjectList.cshtml

@@ -85,12 +85,12 @@
                 <!-- #accordion2 -->
                 <div id="accordion1" class="card-expansion">
                     <!-- .card -->
-                    <div class="card card-expansion-item expanded">
+                    <div class="card card-expansion-item">
                         <div class="card-header border-0" id="headingOne1">
-                            <button id="adv-search-btn" class="btn btn-reset d-flex justify-content-between w-100" data-toggle="collapse" data-target="#collapseOne1" aria-expanded="false" aria-controls="collapseOne1"><span>進階搜尋</span> <span class="collapse-indicator"><i class="fa fa-fw fa-chevron-down"></i></span></button>
+                            <button id="adv-search-btn" class="btn btn-reset d-flex justify-content-between w-100" data-toggle="collapse" data-target="#collapseOne1" aria-expanded="true" aria-controls="collapseOne1"><span>進階搜尋</span> <span class="collapse-indicator"><i class="fa fa-fw fa-chevron-down"></i></span></button>
                         </div>
                         <div>
-                            <div id="collapseOne1" class="collapse" aria-labelledby="headingOne1" data-parent="#accordion1">
+                            <div id="collapseOne1" class="collapse show" aria-labelledby="headingOne1" data-parent="#accordion1">
                                 <div class="card-body pt-0">
                                     
                                     <div class="row">

Views/Home/RateList.cshtml

@@ -64,8 +64,8 @@
                 <table id="dt-responsive" class="table dt-responsive nowrap w-100">
                     <thead>
                         <tr>
-                            <th style="width: 75%;"> 主項目名稱 </th>                        
+                            <th style="width: 65%;"> 主項目名稱 </th>                        
-                        
+                            <th style="width: 10%;"> 順序 </th>
                             <th> 功能 </th>
                         </tr>
                     </thead>
@@ -102,7 +102,12 @@
                             <input type="text" id="modal_mainItem_name" class="form-control" value="" placeholder="主項目名稱" maxlength="36" required=""> <label for="modal_mainItem_name">主項目名稱</label>
                         </div>
                     </div><!-- /.form-group -->
-
+                    <!-- .form-group -->
+                    <div class="form-group">
+                        <div class="form-label-group">
+                            <input type="number" id="modal_mainItem_order" class="form-control" value="" placeholder="順序" required=""> <label for="modal_mainItem_order">順序</label>
+                        </div>
+                    </div><!-- /.form-group -->
                 </div><!-- /.modal-body -->
                 <!-- .modal-footer -->
                 <div class="modal-footer">

wwwroot/assets/javascript/custom/projectlist.js

@@ -2982,7 +2982,8 @@ function loadSubItemTypeahead(mainItem_uid) {
                         highlight: false
                     },
                     {
-                        source: nflTeamsWithDefaults
+                        source: nflTeamsWithDefaults,
+                        limit: 20
                     }
 
                 );
@@ -3096,7 +3097,8 @@ function loadMainItemTypeahead() {
                         highlight: false
                     },
                     {
-                        source: nflTeamsWithDefaults
+                        source: nflTeamsWithDefaults,
+                        limit: 20
                     }
 
                 );
@@ -3412,7 +3414,8 @@ function initInvoiceSelectItem() {
             highlight: false
         },
         {
-            source: nflTeamsWithDefaults
+            source: nflTeamsWithDefaults,
+            limit: 20
         }
     );
 }

wwwroot/assets/javascript/custom/ratelist.js

@@ -27,17 +27,29 @@ $(document).ready(function () {
         var dept_uid = $("#dept_uid").val();
         var mainItem_uid = $('#mainItem_uid').val();
         var mainItem_name = $('#modal_mainItem_name').val();
+        var mainItem_order = $('#modal_mainItem_order').val();
 
         if (mainItem_name == "") {
             alert('請輸入主項目名稱');
-            retur;
+            return;
+        }
+
+        if (mainItem_order == "") {
+            alert('請輸入順序，數字越小越上面!');
+            return;
+        }
+
+        if (mainItem_order.isNumber == false) {
+            alert('請輸入順序數字，數字越小越上面!');
+            return;
         }
 
         var formData = {
             method: method,
             dept_uid: dept_uid,
             mainItem_uid: mainItem_uid,
-            mainItem_name: mainItem_name
+            mainItem_name: mainItem_name,
+            mainItem_order: mainItem_order
         }
 
         $.ajax({
@@ -359,12 +371,13 @@ function loadDataTable() {
 
 
                 },
-                order: [[1, 'desc']],
+                order: [[1, 'asc']],
                 info: true,
                 search: "搜尋:",
                 searching: true,
                 columns: [
                     { data: 'mainItem_name', className: 'align-top text-left', orderable: true, searchable: true },
+                    { data: 'mainItem_order', className: 'align-top text-right', orderable: true, searchable: false },
                     { data: 'mainItem_uid', className: 'align-top text-center', orderable: false, searchable: false }
                 ],
                 columnDefs: [
@@ -381,7 +394,7 @@ function loadDataTable() {
                         }
                     },
                     {
-                        targets: 1,
+                        targets: 2,
                         orderable: false,
                         searchable: false,
                         render: function render(data, type, row, meta) {
@@ -614,6 +627,7 @@ function buttonClick(obj) {
                     $("#mainItem_uid").val(obj.mainItem_uid);
                     $("#dept_uid").val(obj.dept_uid).trigger('change');
                     $("#modal_mainItem_name").val(obj.mainItem_name).trigger('change');
+                    $("#modal_mainItem_order").val(obj.mainItem_order).trigger('change');
 
                     
                     $('#mainItemModal').modal('toggle');