แก้ไข ให้บันทึก เพื่อพิมพ์ได้ก่อน

Models/external_linkage/Iexternal_linkageService.cs

@@ -24,6 +24,8 @@ namespace TodoAPI2.Models
         List<external_linkageViewModel> Getevaluation_accept();
         List<external_linkageViewModel> GetAgreeDisagree();
         List<external_linkageViewModel> GetAgreeDisagree2();
+
+        List<external_linkageViewModel> GetAgreeDisagree3();
         List<external_linkageViewModel> GetDepartmentData();
         List<external_linkageViewModel> GetDepartmentDataForReport();
         List<external_linkageViewModel> GetPositionForReport();

Models/external_linkage/external_linkageService.cs

@@ -248,6 +248,30 @@ namespace TodoAPI2.Models
             return result;
         }
 
+        public List<external_linkageViewModel> GetAgreeDisagree3()
+        {
+            var result = new List<external_linkageViewModel>();
+            var i = new external_linkageViewModel();
+            i.external_id = 1;
+            i.external_code = "Y";
+            i.external_name = "เห็นด้วยกับผลการประเมิน";
+            result.Add(i);
+
+            var j = new external_linkageViewModel();
+            j.external_id = 2;
+            j.external_code = "N";
+            j.external_name = "ไม่เห็นด้วยและมีความเห็นต่าง";
+            result.Add(j);
+
+            var k = new external_linkageViewModel();
+            k.external_id = 3;
+            k.external_code = "R";
+            k.external_name = "อยู่ระหว่างพิจารณา แต่ให้พิมพ์ออกได้ก่อน";
+            result.Add(k);
+
+            return result;
+        }
+
         public List<external_linkageViewModel> GetAgreeDisagree()
         {
             var result = new List<external_linkageViewModel>();

Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml

@@ -648,13 +648,13 @@
         }
 
         function Oneva_create_evaluation_detail_review02_supervisor2_resultChanged(a) {
-            if ($(a).val() == "Y") {
+            if ($(a).val() === "N") {
+                $("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("iRequire", "true");
+                $("#review02x").show();      
+            } else {
                 $("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("iRequire", "false");
                 $("#eva_create_evaluation_detail_review02_supervisor2_remark").css('border-color', '');
                 $("#review02x").hide();                  
-            } else {
-                $("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("iRequire", "true");
-                $("#review02x").show();
             }
         }
 

build_command.txt

@@ -1,5 +1,5 @@
 docker build -t registry.gitlab.com/zd-team/tb/tb320eva_zd .
 
-docker login registry.gitlab.com -u <your username> -p <your password>
+docker login registry.gitlab.com -u nakorn2526 -p 
 
 docker push registry.gitlab.com/zd-team/tb/tb320eva_zd

wwwroot/js/eva_create_evaluation_detail_review02/eva_create_evaluation_detail_review02_d.js

@@ -59,8 +59,7 @@ var eva_create_evaluation_detail_review02_customValidation = function (group) {
 };
 
 function eva_create_evaluation_detail_review02_PutUpdate(xx) {
-	if (!ValidateForm('eva_create_evaluation_detail_review02', eva_create_evaluation_detail_review02_customValidation))
-    {
+    if (!ValidateForm('eva_create_evaluation_detail_review02', eva_create_evaluation_detail_review02_customValidation)) {
         return;
     }
     var data = eva_create_evaluation_detail_review02_GetFromForm();