From 98dd8b0860be06b0c10b76b6ac7656cc078d9cff Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Sat, 11 Sep 2021 12:28:00 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=84?= =?UTF-8?q?=E0=B9=89=E0=B8=99=E0=B8=AB=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...eva_create_evaluation_detail_firstdoc.xlsx | Bin 11037 -> 11002 bytes ...@eva_create_evaluation_detail_process.xlsx | Bin 10847 -> 11110 bytes ...e_evaluation_detail_firstdocSearchModel.cs | 4 +-- ...reate_evaluation_detail_firstdocService.cs | 34 ++++++++++++++---- ...n_detail_firstdocWithSelectionViewModel.cs | 2 ++ ...te_evaluation_detail_processSearchModel.cs | 2 ++ ...create_evaluation_detail_processService.cs | 22 +++++++++--- ...on_detail_processWithSelectionViewModel.cs | 2 ++ ...a_create_evaluation_detail_firstdoc.cshtml | 25 +++++++------ ...va_create_evaluation_detail_process.cshtml | 28 ++++++++++----- .../eva_limit_frame_group_d.cshtml | 2 +- .../vw_limit_frame_plan_d.cshtml | 10 +++++- .../eva_create_evaluation_detail_firstdoc.js | 8 ++--- .../eva_create_evaluation_detail_process.js | 3 +- 14 files changed, 103 insertions(+), 39 deletions(-) diff --git a/EXCEL/eva_create_evaluation_detail@eva_create_evaluation_detail_firstdoc.xlsx b/EXCEL/eva_create_evaluation_detail@eva_create_evaluation_detail_firstdoc.xlsx index 304c55fb28190080b6e433ba8f8d35221f092727..a2869ed7c7760c6ffde60d56470b10163d975801 100644 GIT binary patch delta 5110 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 delta 5170 zcmZ8lWmMGL*Pfx3X6PB|PLXaA=`IC^&Oy3M_|YvR4lPIsN`rvINQ;2f2uKX2(jf>U zUHa<%zw5fzJzvf~dq3xVIP2MYZdQ1&VUDP2^O`swkb00YkbnmQ0fZnBB?trx@emF6 z_H%de_I4Ku@${%Mwf25`lQyEL`B&7X{uznHwduk%n_y|c!(R~f-w40FJ-m&RiV+P$>S21pMl&iRuKkCi^*Kz zg*oP@aV=4&4$Jpj7Yf+A9NyC9ob;>c8qAosjA6uRgYB=HySK)L!!-u=m4;uax&sCl zgTZ1k#NR_2Kj$4P3Y(FqAWPgcrZzrPx7L}ZsoNv0eDsU;Q19qm(79qK&%GW}+Mu4* zHv@JqckS8hv_~71SpXsN4OlH zYZ4!(w@cTLx-&F$-;teQ-oC`g2345Eqp&7 zs}2LeqiQN=#dNHPt`$7V+ zms+!@!F>bvSdC}5@ZD`N8|8xEd-eC=2h(N}`%Fvbv8!>;X+PwhsG29lilLfG%?JuP zG|@K;S6jHauLvh$eyUJ3h5Iw}g9&}sk`rj%ja>Jdvqe($dYx`K<$#Ck!t(t!6 zX$4z4?Uu`gmS__rd>Lv}5HzrtVp<*EV;Dn}eh!Z{-g_2^> z!{cQ{#WTp@ZC^HZF|gnPCvwCb^#mYL8Vv|U{{K`C2=#FOhr^TRSg#c+s!oPYd6HK7 z^CnZlhW4Z^5_7v2zD1!iL17~)BkfyUapsEt&a4!!tYI z1n~o`PXf&M-2T4LO7t{&_0T{-oySD6v!!#5mD+j^aN#5&_DKElEzWiUH>X`U$H?4> zU!R((!}S^5wd278Lp--|cRcEZtF>^=Y*@3`CEPwgszj2a>^mCs_4Kr+iw)ljq()8@N|=cgjU3_&#nUs~f8ZpWsgxit}u#w7?1~M9nSl z>t&@10*0<;p&yLHQf@WhA(gvPwx_?{d?x&b{+T(RUVB|Tb&P|Zn=aDbgSf$+q zh@DZ;sA|oy+x-r?uM!-TOuMOl#yC_Vh4HEDIzluFvs%9znt@ z;!LUYt}b{LI13hMzDDhPRp$`Xk(F2=Mulc2n-yb)RXSF=eyEtegk_redO$CzB#A>G zc*-%ARXabfTiI;5QohQAwY35hS*p)OrXk#}4%<$T>#|i^^C9!6ChWJbz1Af`hOPCC z9pL4)R_UfWW);dzuc=UVGo-0MrGRR0?i81|^jQ{lBw5%hKaf8^k}YCym7Kbt{lO%n zCgXWJG>kc+3KL)QfkJ!po=T29!q$`6U;Bp9XzJ3q{lvFq-MO+_Q5`+2fH zRgXcTcdNjD`%P2VcF*u<%+bWi{Mf0Ajf!u@QlA9a3?d0SWROB&DqiNM!iaIJEnFfNYoQXCHY?`&LxlG?T3~ zY?tZluFo#TyqZDk$lGEAMXz!=C_G6q0RN&tc*kgY_5%X;co0Do@{@1>#)%Z;=-y>7 ztKCT#d7C3VeZppfE##MFLyX@&matS+4Y9I2Cg6AC`sRsQ4d?D|!3`N|9ocXA0?K03JAG7j^ko5V3ZAy7+n;fl|I zU{O(T-6Mligm~W?F>=3J32ejXy;eGz&BAl0sI<978}Fp{E+?)`S8h-Xb~6|7O>Qjx zksWt}(TTY{;?t=3QUaiS=Fok$d#+-BMlYIw!FAo=atyK^ zC9k1x`d%TZpCTmR07=cZ*bJAI#qN0Tt}Y&Xx+>8TTtPEhO837wyq(}o)*2X~o*qQY z{4&T?^6wK)YF%uky1w8{)wr1@qy-z@A*Q5%eQJAm=@)yP$$P}l`sLcb{HsE^hTnA? zhhreN(^E5`^Crnoa4$@iIacb@QmglXX!H8#wf0iZwh@ofJ+clJVDZRP@F72=-cJ<1 z2+|fBR?e>QWoX~)rSxVf=Luxk#_ihZ5KX}X$yyH4_ZqUW!VLNEZAE%CY$O5Sg@nPM zPEDFr+=xa67Qc%aC;Yx!pHTEZR-0}j&J}Q$+C7Z$R$wHz|4MkVm`v96M&%>s5Iib4 z2_0SH%C8c%wcRcsXv2Q(ov~wy zJEp4N828=uQC8i!i6lz^x$TtsHgkm8N?VYC^KVsvqc# z7rXnlL~U)T3SZ}5J#^A=zSVbsB*C&e1A{0ft;FlPPbV?qT;3B5dPY%A4{gq-oN@W& z5PR=L9zClGrhOaeg^+9!CK>nJ6=+fLG&0`xPP>ush?6iu5WCDHHXMu^kJ`f#pHtWK zPZ4_Aibf7LtW32})fIa`t5be0Sq5gZB8@n-`5o5T%83>Xp`MsGj7#dNuMqdL66U2B zy_nrFN5w45p1fBaJ;%l=zB-j)=`Tn)T0`X7Y{Q-{4*HET)rH0#b3wGA$4TD8GWjk~ z^vYquSwfPO!uUZq`AY++mxwxM{}@j|lAn1u8XP>K`L34uh-y}Ti($np3t%amjDlu2 zlS?yjE+9s&Bv2~v6eSk#-6FyLc`PygFtsXDv|MKNRb6BKetlxL!iED~3-SVFC{}+m z5Y^^ZR{I;L>a{s)3<8=b=% z>SE^CikLkkSb-eQ)y*n&!_;|t@ogAQ8g^-q$L zosEPhRZL=Si)d*QA3XvIYyjS2w_@)l1)jf`B;HUG-@c9~1e`!YqlD)}y0x?*8knzG zmS`Mku|28hl$w=ld{(0NUZbze>mXKMNBI0jri6hxC9vPtfqzkVyfAGo5Ib<8^3bN^ zgWk41LfCqCo&Q?0IXqJiYfV@GK4sggjqcIOdPU-lRm*AcICZ;Q-b-}ERHRIBMewX( ztfknO9er!naDmkaz}J<|g6#!97uCd8qXvPb8E@bH zFCOkoctCZ;1uk5dRr+w@n8-e1I;cE%D{ip6BezCg z(0*%B#OL);DV5iPzJ&9o6q0vTg9sOV%{#QXUK`fd{Y@}>)C*(Z#7^TprLMDelF^VeG8B`xiX0aup(w=1a$;QR zaMj}S&t->WlV+z0SG(-$RN99)Fk{ifR!?m?@vp088gSf3c_WwSMk_@hZFGVEgz{@U z7ED-eFbHJbl*PdY2GX7k>%Y56rFNousk$1mEaMq!t|h?oHAP#KAbQ5)xcPO`jo~1z zixU|)sPWsF@{P~3{;sPJJ52%)38x3u8Irj8Q*IxqYj%i?xxY^GHe6Mhh?#nnfcNcf zNoZ(jhQDg4Ftl{ekR3_P7)k;PKjv!wR|?&>X?D*TuOts{)Bx4G*LnM z7TvwYJiBL06pT-!lhQTc5|_=+wGxx0mk<%o$?MX@0PQR_et^{B&_HF`m!}OAV!OG* zrz)@od0t}2d9;@NmSfx{L6>Ne&AFLlWgFc0wzG)L8hx&}M<{RRq%4bB>-N;hnX}BH zb`0iAj+eWxV}yD-pc6f%p$t;F%TA_vSDD`%mH7Ta^pFttqYSrim^JksUU9j$pPM{I zN5M-Jgnz$~Qy4o9nDDa-{cK7T4Yx2DIA$gL z1eN_HM;2Y8Ja65KIrFZlDo1veZgO$A4Ii zS?kt@_`4>}x97ZaD~NxJD3T)qxI~A4q{iW^RFrgTzPv5QT^Dx#WlU}^nvyl>eQ&pA zgwCM6dy;qMUICWcQMK9U0vw64EBxhc@)I{7FIu9N}&frlA0D}o`GTHun z?LkFHeiA;uUNAf!D*6x9!RZQ%^)8OLI#k;WAV@OEUR=|S(--0!4_C6z%I?o@&u~N1 zg$k;QL==`I=K7$j-`hVNl+2-dRI#EymM3n-UZJR2O7`vPIK|1)XDvP7PbnuTal_SW zXO*kLh1kr8XT#^Lze|)~s5ah5sLg8>6u%Gut`QFg+!04FMpor>(Qo{|ftBp?g>hl{^mof;nm VqWWw7EwOW>J_>LUE%E-*{vT#nWoZBa diff --git a/EXCEL/eva_create_evaluation_detail@eva_create_evaluation_detail_process.xlsx b/EXCEL/eva_create_evaluation_detail@eva_create_evaluation_detail_process.xlsx index 4d36c655d8aec74a4042f7e7283ce1e8ce335148..f72c2c4f50db0fa07f17aaf020ebc018eaf6b949 100644 GIT binary patch delta 5100 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 L*l@sHf9?Jcp$rKW diff --git a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocSearchModel.cs b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocSearchModel.cs index d511f95..cbc0a31 100644 --- a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocSearchModel.cs +++ b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocSearchModel.cs @@ -20,9 +20,9 @@ namespace TodoAPI2.Models public int? org_id { get; set; } - public string search_employee_code { get; set; } + public int? employee_id { get; set; } - public string search_employee_fullname { get; set; } + public string evaluation_round_search { get; set; } } } diff --git a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs index 214c03e..f1609ff 100644 --- a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs +++ b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocService.cs @@ -223,16 +223,30 @@ namespace TodoAPI2.Models var entity = Get(id, emp_id); var i = Mapper.Map(entity); i.item_org_id = ext.GetDepartmentData(); - - + i.item_employee_id = (from x in emp.GetAllEmployee() + where x.count_resigns == 0 && x.workingstatus != "คณะกรรมการเนติบัณฑิตยสภา" + orderby x.fullname + select new external_linkageViewModel { external_id = x.id, external_name = x.fullname } + ).ToList(); + i.item_evaluation_round_search = (from x in _repository.Context.eva_performance_plan + orderby x.fiscal_year descending, x.theTime descending + select new external_linkageViewModel { id_guid = x.id, external_name = checkNull(x.theTime) + "/" + checkNull(x.fiscal_year) } + ).ToList(); return i; } public eva_create_evaluation_detail_firstdocWithSelectionViewModel GetBlankItem() { var i = new eva_create_evaluation_detail_firstdocWithSelectionViewModel(); i.item_org_id = ext.GetDepartmentData(); - - + i.item_employee_id = (from x in emp.GetAllEmployee() + where x.count_resigns == 0 && x.workingstatus != "คณะกรรมการเนติบัณฑิตยสภา" + orderby x.fullname + select new external_linkageViewModel { external_id = x.id, external_name = x.fullname } + ).ToList(); + i.item_evaluation_round_search = (from x in _repository.Context.eva_performance_plan + orderby x.fiscal_year descending, x.theTime descending + select new external_linkageViewModel { id_guid = x.id, external_name = checkNull(x.theTime) + "/" + checkNull(x.fiscal_year) } + ).ToList(); return i; } @@ -245,6 +259,14 @@ namespace TodoAPI2.Models public List GetListBySearch(eva_create_evaluation_detail_firstdocSearchModel model, int? emp_id) { + if (string.IsNullOrEmpty(model.evaluation_round_search)) + { + model.evaluation_round_search = (from x in _repository.Context.eva_performance_plan + orderby x.fiscal_year descending, x.theTime descending + select new external_linkageViewModel { id_guid = x.id, external_name = checkNull(x.theTime) + "/" + checkNull(x.fiscal_year) } + ).FirstOrDefault().id_guid.ToString(); + } + var allemp = emp.GetListByemployee_type(null, null); var dept = ext.GetDepartmentData(); @@ -282,8 +304,8 @@ namespace TodoAPI2.Models where 1 == 1 && (m_eva_create_evaluation_detail_agreement.create_evaluation_id == model.create_evaluation_id || !model.create_evaluation_id.HasValue) && (fk_external_employee.department_id == model.org_id || !model.org_id.HasValue) - && (fk_external_employee.employee_no == model.search_employee_code || string.IsNullOrEmpty(model.search_employee_code)) - && (fk_external_employee.fullname.Contains(model.search_employee_fullname) || string.IsNullOrEmpty(model.search_employee_fullname)) + && (fk_external_employee.id == model.employee_id || !model.employee_id.HasValue) + && (string.IsNullOrEmpty(model.evaluation_round_search) || fk_planResult.id == Guid.Parse(model.evaluation_round_search)) && (m_eva_create_evaluation_detail_agreement.employee_id == emp_id || m_eva_create_evaluation_detail_agreement.chief == emp_id) orderby diff --git a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocWithSelectionViewModel.cs b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocWithSelectionViewModel.cs index 23a1ef0..9460fd9 100644 --- a/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocWithSelectionViewModel.cs +++ b/Models/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdocWithSelectionViewModel.cs @@ -8,6 +8,8 @@ namespace TodoAPI2.Models public class eva_create_evaluation_detail_firstdocWithSelectionViewModel: eva_create_evaluation_detail_firstdocViewModel { public List item_org_id { get; set; } + public List item_employee_id { get; set; } + public List item_evaluation_round_search { get; set; } } } \ No newline at end of file diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processSearchModel.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processSearchModel.cs index 780d1d1..d2ba40f 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processSearchModel.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processSearchModel.cs @@ -24,6 +24,8 @@ namespace TodoAPI2.Models public int? employee_id { get; set; } + public string evaluation_round_search { get; set; } + public string path { get; set; } } } diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs index 5712646..ae64442 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs @@ -222,7 +222,11 @@ namespace TodoAPI2.Models item.item_level_score = (from i in _repository.Context.eva_level_score orderby i.min_score select Mapper.Map(i)).ToList(); - item.item_employee_id = (from x in emp.GetAllEmployee() where x.count_resigns == 0 select x).ToList(); + item.item_employee_id = (from x in emp.GetAllEmployee() where x.count_resigns == 0 && x.workingstatus != "คณะกรรมการเนติบัณฑิตยสภา" select x).ToList(); + item.item_evaluation_round_search = (from x in _repository.Context.eva_performance_plan + orderby x.fiscal_year descending, x.theTime descending + select new external_linkageViewModel { id_guid = x.id, external_name = checkNull(x.theTime) + "/" + checkNull(x.fiscal_year) } + ).ToList(); return item; } @@ -231,9 +235,10 @@ namespace TodoAPI2.Models var i = new eva_create_evaluation_detail_processWithSelectionViewModel(); i.item_org_id = ext.GetDepartmentData(); i.item_employee_id = (from x in emp.GetAllEmployee() where x.count_resigns == 0 && x.workingstatus != "คณะกรรมการเนติบัณฑิตยสภา" select x).ToList(); - //i.item_level_score = (from j in _repository.Context.eva_level_score - // orderby j.min_score - // select Mapper.Map(i)).ToList(); + i.item_evaluation_round_search = (from x in _repository.Context.eva_performance_plan + orderby x.fiscal_year descending, x.theTime descending + select new external_linkageViewModel { id_guid = x.id, external_name = checkNull(x.theTime) + "/" + checkNull(x.fiscal_year) } + ).ToList(); return i; } @@ -260,6 +265,14 @@ namespace TodoAPI2.Models public List GetListBySearch(eva_create_evaluation_detail_processSearchModel model, int? emp_id, string path) { + if (string.IsNullOrEmpty(model.evaluation_round_search)) + { + model.evaluation_round_search = (from x in _repository.Context.eva_performance_plan + orderby x.fiscal_year descending, x.theTime descending + select new external_linkageViewModel { id_guid = x.id, external_name = checkNull(x.theTime) + "/" + checkNull(x.fiscal_year) } + ).FirstOrDefault().id_guid.ToString(); + } + var allemp = emp.GetListByemployee_type(null, null); var all_org_id = from i in ext.GetAllChildInDep(model.org_id) select i.external_id; @@ -295,6 +308,7 @@ namespace TodoAPI2.Models && (all_org_id.Contains(fk_external_employee.department_id) || !model.org_id.HasValue) && (fk_external_employee.employee_no == model.search_employee_code || string.IsNullOrEmpty(model.search_employee_code)) && (fk_external_employee.fullname.Contains(model.search_employee_fullname) || string.IsNullOrEmpty(model.search_employee_fullname)) + && (string.IsNullOrEmpty(model.evaluation_round_search) || fk_planResult.id == Guid.Parse(model.evaluation_round_search)) && emp_id.HasValue && ( (m_eva_create_evaluation_detail_process.chief.HasValue && emp_id == m_eva_create_evaluation_detail_process.chief) diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs index 6eab281..d270a2f 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processWithSelectionViewModel.cs @@ -13,6 +13,8 @@ namespace TodoAPI2.Models public List item_employee_id { get; set; } + public List item_evaluation_round_search { get; set; } + public decimal? create_evaluation_score1 { get; set; } public decimal? create_evaluation_score2 { get; set; } diff --git a/Views/eva_create_evaluation_detail_firstdocView/eva_create_evaluation_detail_firstdoc.cshtml b/Views/eva_create_evaluation_detail_firstdocView/eva_create_evaluation_detail_firstdoc.cshtml index 79a6996..c05b1fb 100644 --- a/Views/eva_create_evaluation_detail_firstdocView/eva_create_evaluation_detail_firstdoc.cshtml +++ b/Views/eva_create_evaluation_detail_firstdocView/eva_create_evaluation_detail_firstdoc.cshtml @@ -29,20 +29,19 @@
+
+ + +
+ +
+ + +
- -
- -
- - -
- -
- - +
@@ -81,6 +80,10 @@ eva_create_evaluation_detail_firstdoc_InitiateDataTable(); eva_create_evaluation_detail_firstdoc_InitialForm(); SetupValidationRemark("eva_create_evaluation_detail_firstdoc"); + + $("#s_eva_create_evaluation_detail_firstdoc_org_id").select2(); + $("#s_eva_create_evaluation_detail_firstdoc_employee_id").select2(); + $("#s_eva_create_evaluation_detail_firstdoc_evaluation_round_search").select2(); }); } diff --git a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml index 091106b..b6f88fb 100644 --- a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml +++ b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml @@ -26,16 +26,30 @@
-
+
+ + +
+ +
+ + +
+ +
-
- - +
+
+
+ + + + -
-
- -
-
@@ -86,6 +95,7 @@ SetupValidationRemark("eva_create_evaluation_detail_process"); $("#s_eva_create_evaluation_detail_process_org_id").select2(); $("#s_eva_create_evaluation_detail_process_employee_id").select2(); + $("#s_eva_create_evaluation_detail_process_evaluation_round_search").select2(); }); } diff --git a/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml b/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml index 9e55a6b..73b2448 100644 --- a/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml +++ b/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml @@ -169,7 +169,7 @@
- +
diff --git a/Views/vw_limit_frame_planView/vw_limit_frame_plan_d.cshtml b/Views/vw_limit_frame_planView/vw_limit_frame_plan_d.cshtml index 2a1ee1e..2ef7524 100644 --- a/Views/vw_limit_frame_planView/vw_limit_frame_plan_d.cshtml +++ b/Views/vw_limit_frame_planView/vw_limit_frame_plan_d.cshtml @@ -75,12 +75,20 @@
+
+
+ +
+
+
+ + @@ -135,7 +143,7 @@
- +
diff --git a/wwwroot/js/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdoc.js b/wwwroot/js/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdoc.js index b010ca8..d92e46e 100644 --- a/wwwroot/js/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdoc.js +++ b/wwwroot/js/eva_create_evaluation_detail_firstdoc/eva_create_evaluation_detail_firstdoc.js @@ -7,8 +7,8 @@ function eva_create_evaluation_detail_firstdoc_GetSearchParameter() { var eva_create_evaluation_detail_firstdocSearchObject = new Object(); eva_create_evaluation_detail_firstdocSearchObject.create_evaluation_id = $("#s_eva_create_evaluation_detail_firstdoc_create_evaluation_id").val(); eva_create_evaluation_detail_firstdocSearchObject.org_id = $("#s_eva_create_evaluation_detail_firstdoc_org_id").val(); - eva_create_evaluation_detail_firstdocSearchObject.search_employee_code = $("#s_eva_create_evaluation_detail_firstdoc_search_employee_code").val(); - eva_create_evaluation_detail_firstdocSearchObject.search_employee_fullname = $("#s_eva_create_evaluation_detail_firstdoc_search_employee_fullname").val(); + eva_create_evaluation_detail_firstdocSearchObject.employee_id = $("#s_eva_create_evaluation_detail_firstdoc_employee_id").val(); + eva_create_evaluation_detail_firstdocSearchObject.evaluation_round_search = $("#s_eva_create_evaluation_detail_firstdoc_evaluation_round_search").val(); return eva_create_evaluation_detail_firstdocSearchObject; } @@ -16,8 +16,8 @@ function eva_create_evaluation_detail_firstdoc_GetSearchParameter() { function eva_create_evaluation_detail_firstdoc_FeedDataToSearchForm(data) { $("#s_eva_create_evaluation_detail_firstdoc_create_evaluation_id").val(data.create_evaluation_id); DropDownClearFormAndFeedWithData($("#s_eva_create_evaluation_detail_firstdoc_org_id"), data, "id", "external_name", "item_org_id", data.org_id); - $("#s_eva_create_evaluation_detail_firstdoc_search_employee_code").val(data.search_employee_code); - $("#s_eva_create_evaluation_detail_firstdoc_search_employee_fullname").val(data.search_employee_fullname); + DropDownClearFormAndFeedWithData($("#s_eva_create_evaluation_detail_firstdoc_employee_id"), data, "external_id", "external_name", "item_employee_id", data.employee_id); + DropDownClearFormAndFeedWithData($("#s_eva_create_evaluation_detail_firstdoc_evaluation_round_search"), data, "id_guid", "external_name", "item_evaluation_round_search", data.evaluation_round_search); } diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js index 5668881..4e7d138 100644 --- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js +++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js @@ -10,6 +10,7 @@ function eva_create_evaluation_detail_process_GetSearchParameter() { eva_create_evaluation_detail_processSearchObject.search_employee_code = $("#s_eva_create_evaluation_detail_process_search_employee_code").val(); eva_create_evaluation_detail_processSearchObject.search_employee_fullname = $("#s_eva_create_evaluation_detail_process_search_employee_fullname").val(); eva_create_evaluation_detail_processSearchObject.employee_id = $("#s_eva_create_evaluation_detail_process_employee_id").val(); + eva_create_evaluation_detail_processSearchObject.evaluation_round_search = $("#s_eva_create_evaluation_detail_process_evaluation_round_search").val(); eva_create_evaluation_detail_processSearchObject.path = "d"; @@ -22,7 +23,7 @@ function eva_create_evaluation_detail_process_FeedDataToSearchForm(data) { $("#s_eva_create_evaluation_detail_process_search_employee_code").val(data.search_employee_code); $("#s_eva_create_evaluation_detail_process_search_employee_fullname").val(data.search_employee_fullname); DropDownClearFormAndFeedWithData($("#s_eva_create_evaluation_detail_process_employee_id"), data, "id", "fullname", "item_employee_id", data.employee_id); - console.log(data.item_employee_id); + DropDownClearFormAndFeedWithData($("#s_eva_create_evaluation_detail_process_evaluation_round_search"), data, "id_guid", "external_name", "item_evaluation_round_search", data.evaluation_round_search); } //================= Form Data Customizaiton =========================================