From 37d949a0b8c5ab1b81d1da4c0c33590b3515efde Mon Sep 17 00:00:00 2001 From: WONKI LEE Date: Wed, 1 May 2024 00:15:20 +0900 Subject: [PATCH] 2024-05-01 [wklee] --- .../019dba2e3e3ca39be57cdeda0181255f2a108089 | 19 + .../045883b4f5ac6b17d1a3ec1336a89225264923fc | 176 +++---- .../1f436c64b19d14fe15dc7140f781c3c7a96ffd6c | 66 +-- .../37af8ab61b5521209dfb77046413f87c5e4895ed | 0 .../4714a4eb41b010ff16a0b0d6e1239c2bfe52a965 | 4 + .../506ce27b4205c168de6546ae8ee0d23065d27196 | 14 + .../511551275fbc396506b504a6206e578e548b5625 | 84 ++-- .../7b4c396d650b291c80d654c1ef7134d97c208db6 | 3 + .../7f5a5c9663643d4c11bf16ae3de896ce271e9509 | 2 + .../806b045f1c9e62be2771054b6ad277951dff458f | 37 ++ .../9187a16dfed596874548fa079f89d5e9b5286fcf | 0 .../9ee0c53e411ae30e9aa7e0bfcd2eefd80a8b5581 | 19 + .../cdaa167bac242b837f9c999bede6e14a85a86af6 | 42 +- .../f909f1873ad9b00d3aadf1e34a760d41d322c9fa | 0 .../fa48dc62db7f51377363d747a87d1ef772ce2b85 | 30 +- .../fde79b6f9096fc58551697e656ab8dfbbf18f854 | 16 + .../ff4caf8a71f28c32739b5561e3082208fd397365 | 2 + .idea/sonarlint/issuestore/index.pb | 26 +- .../019dba2e3e3ca39be57cdeda0181255f2a108089 | 0 .../37af8ab61b5521209dfb77046413f87c5e4895ed | 0 .../4714a4eb41b010ff16a0b0d6e1239c2bfe52a965 | 0 .../506ce27b4205c168de6546ae8ee0d23065d27196 | 0 .../7b4c396d650b291c80d654c1ef7134d97c208db6 | 0 .../7f5a5c9663643d4c11bf16ae3de896ce271e9509 | 0 .../806b045f1c9e62be2771054b6ad277951dff458f | 0 .../9187a16dfed596874548fa079f89d5e9b5286fcf | 0 .../9ee0c53e411ae30e9aa7e0bfcd2eefd80a8b5581 | 0 .../f909f1873ad9b00d3aadf1e34a760d41d322c9fa | 0 .../fde79b6f9096fc58551697e656ab8dfbbf18f854 | 0 .../ff4caf8a71f28c32739b5561e3082208fd397365 | 0 .idea/sonarlint/securityhotspotstore/index.pb | 26 +- home_dir/www/ksvc/base/insp/insp.js | 43 +- home_dir/www/ksvc/base/insp/insp.php | 2 + home_dir/www/ksvc/base/insp/insp_excel.js | 162 ++----- home_dir/www/ksvc/base/item/item.js | 16 +- .../reg_faclt_defect/reg_faclt_defect.js | 13 +- .../reg_faclt_repair/reg_faclt_repair.js | 5 +- home_dir/www/ksvc/inc/common.ajax.php | 256 +++++----- .../www/ksvc/inc/css/scss/common/_common.scss | 16 +- .../ksvc/inc/css/scss/component/_table.scss | 61 ++- home_dir/www/ksvc/inc/css/style.css | 24 +- home_dir/www/ksvc/inc/css/style.css.map | 1 + home_dir/www/ksvc/inc/js/vars.js.php | 5 +- .../prod/cnt_ct_worker/cnt_ct_worker.ajax.php | 12 +- .../ksvc/prod/cnt_ct_worker/cnt_ct_worker.js | 6 +- .../cnt_defect_order.ajax.php | 4 +- .../prod/cnt_defect_order/cnt_defect_order.js | 4 +- .../cnt_defect_worker.ajax.php | 2 +- .../cnt_defect_worker/cnt_defect_worker.js | 2 +- .../prod/cnt_oper_wt/cnt_oper_wt.ajax.php | 2 +- .../cnt_prod_faclt/cnt_prod_faclt.ajax.php | 2 +- .../prod/cnt_prod_faclt/cnt_prod_faclt.php | 2 +- .../cnt_prod_worker/cnt_prod_worker.ajax.php | 7 +- .../prod/cnt_prod_worker/cnt_prod_worker.php | 2 +- .../ksvc/prod/reg_order/reg_order.ajax.php | 3 +- home_dir/www/ksvc/prod/reg_order/reg_order.js | 12 +- .../prod/reg_order_result/reg_order_result.js | 4 +- home_dir/www/ksvc/prod/reg_plan/reg_plan.js | 136 +++++- .../www/ksvc/prod/sts_order/sts_order.php | 12 +- .../sts_order_prod/popComponent/isDefHst.php | 4 +- .../sts_order_prod/popComponent/isRun.php | 4 +- .../sts_order_prod/popComponent/isWorker.php | 2 +- .../sts_order_prod/reg_prod_result.ajax.php | 145 +++++- .../site/sts_order_prod/reg_prod_result.js | 450 +++++++++++++++--- .../site/sts_order_prod/reg_prod_result.php | 4 +- .../sts_order_pop_util.inc.php | 10 +- .../site/sts_order_prod/sts_order_prod.js | 47 +- .../site/sts_order_prod/sts_order_prod.php | 19 +- 68 files changed, 1358 insertions(+), 709 deletions(-) create mode 100644 .idea/sonarlint/issuestore/0/1/019dba2e3e3ca39be57cdeda0181255f2a108089 create mode 100644 .idea/sonarlint/issuestore/3/7/37af8ab61b5521209dfb77046413f87c5e4895ed create mode 100644 .idea/sonarlint/issuestore/4/7/4714a4eb41b010ff16a0b0d6e1239c2bfe52a965 create mode 100644 .idea/sonarlint/issuestore/5/0/506ce27b4205c168de6546ae8ee0d23065d27196 create mode 100644 .idea/sonarlint/issuestore/7/b/7b4c396d650b291c80d654c1ef7134d97c208db6 create mode 100644 .idea/sonarlint/issuestore/7/f/7f5a5c9663643d4c11bf16ae3de896ce271e9509 create mode 100644 .idea/sonarlint/issuestore/8/0/806b045f1c9e62be2771054b6ad277951dff458f create mode 100644 .idea/sonarlint/issuestore/9/1/9187a16dfed596874548fa079f89d5e9b5286fcf create mode 100644 .idea/sonarlint/issuestore/9/e/9ee0c53e411ae30e9aa7e0bfcd2eefd80a8b5581 create mode 100644 .idea/sonarlint/issuestore/f/9/f909f1873ad9b00d3aadf1e34a760d41d322c9fa create mode 100644 .idea/sonarlint/issuestore/f/d/fde79b6f9096fc58551697e656ab8dfbbf18f854 create mode 100644 .idea/sonarlint/issuestore/f/f/ff4caf8a71f28c32739b5561e3082208fd397365 create mode 100644 .idea/sonarlint/securityhotspotstore/0/1/019dba2e3e3ca39be57cdeda0181255f2a108089 create mode 100644 .idea/sonarlint/securityhotspotstore/3/7/37af8ab61b5521209dfb77046413f87c5e4895ed create mode 100644 .idea/sonarlint/securityhotspotstore/4/7/4714a4eb41b010ff16a0b0d6e1239c2bfe52a965 create mode 100644 .idea/sonarlint/securityhotspotstore/5/0/506ce27b4205c168de6546ae8ee0d23065d27196 create mode 100644 .idea/sonarlint/securityhotspotstore/7/b/7b4c396d650b291c80d654c1ef7134d97c208db6 create mode 100644 .idea/sonarlint/securityhotspotstore/7/f/7f5a5c9663643d4c11bf16ae3de896ce271e9509 create mode 100644 .idea/sonarlint/securityhotspotstore/8/0/806b045f1c9e62be2771054b6ad277951dff458f create mode 100644 .idea/sonarlint/securityhotspotstore/9/1/9187a16dfed596874548fa079f89d5e9b5286fcf create mode 100644 .idea/sonarlint/securityhotspotstore/9/e/9ee0c53e411ae30e9aa7e0bfcd2eefd80a8b5581 create mode 100644 .idea/sonarlint/securityhotspotstore/f/9/f909f1873ad9b00d3aadf1e34a760d41d322c9fa create mode 100644 .idea/sonarlint/securityhotspotstore/f/d/fde79b6f9096fc58551697e656ab8dfbbf18f854 create mode 100644 .idea/sonarlint/securityhotspotstore/f/f/ff4caf8a71f28c32739b5561e3082208fd397365 create mode 100644 home_dir/www/ksvc/inc/css/style.css.map rename home_dir/www/ksvc/site/sts_order_prod/{popComponent => }/sts_order_pop_util.inc.php (90%) diff --git a/.idea/sonarlint/issuestore/0/1/019dba2e3e3ca39be57cdeda0181255f2a108089 b/.idea/sonarlint/issuestore/0/1/019dba2e3e3ca39be57cdeda0181255f2a108089 new file mode 100644 index 0000000..a8478c3 --- /dev/null +++ b/.idea/sonarlint/issuestore/0/1/019dba2e3e3ca39be57cdeda0181255f2a108089 @@ -0,0 +1,19 @@ + +o Web:S6853/"/A form label must be associated with a control.(̏J$917c4899-09a2-46ce-bbe4-a231f08d85ee +Yphp:S113"'Add a new line at the end of this file.J$6c731b40-9164-48a2-8980-e25ad4c17c6c + php:S1192 "SDefine a constant instead of duplicating this literal "/img/popupIcon.php" 3 times.(ůJ$19e1ff6f-1eaa-4c97-854b-faf239ad0738 +a php:S2003 "&Replace "include" with "include_once".(ůJ$bc59bebc-78a6-4fd3-b186-d6f7fc0a2919 +a php:S2003,"&Replace "include" with "include_once".(ůJ$24679663-4f41-412b-b5c4-d1bd3e7b29b5 +a php:S20031"&Replace "include" with "include_once".(ůJ$b27bf36e-67fd-436f-a314-752f7f27c345 +a php:S2003]"&Replace "include" with "include_once".(ӑJ$1948a547-230f-42bc-a2b9-41e9d510800f +a php:S2003a"&Replace "include" with "include_once".(J$d5b67814-ffa6-4ad4-bd54-e0b9a0ace0e3 + php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$7c71c611-3764-4269-9fb2-90f1ffec7f25 + php:S4833 "QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$a2effcfe-17ed-410a-aa87-fa895050e134 + php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$32920d2b-d0df-4709-b3ab-3a1e04f1463e + php:S4833 "LReplace "include" with namespace import mechanism through the "use" keyword.(ůJ$8d520cb9-d0c4-4881-afe4-dd508555a9aa + php:S4833,"LReplace "include" with namespace import mechanism through the "use" keyword.(ůJ$fbbcc677-d25a-45ae-8305-68be271fe6d0 + php:S48331"LReplace "include" with namespace import mechanism through the "use" keyword.(ůJ$afd16ed7-8706-4c6b-8a3d-cfe39df32f97 + php:S4833]"LReplace "include" with namespace import mechanism through the "use" keyword.(ӑJ$399f6e86-f05c-46be-8cac-5a6dba078a34 + php:S4833a"LReplace "include" with namespace import mechanism through the "use" keyword.(J$2a03a0af-82ff-47f0-8d3d-0d5836d62a09 + php:S4833}"QReplace "include_once" with namespace import mechanism through the "use" keyword.(ـJ$438f1167-e6ab-4626-8474-4f3dee939bcb + php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$964e44ec-7254-4341-be92-0e29af7df544 \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/0/4/045883b4f5ac6b17d1a3ec1336a89225264923fc b/.idea/sonarlint/issuestore/0/4/045883b4f5ac6b17d1a3ec1336a89225264923fc index d47b9af..5591d16 100644 --- a/.idea/sonarlint/issuestore/0/4/045883b4f5ac6b17d1a3ec1336a89225264923fc +++ b/.idea/sonarlint/issuestore/0/4/045883b4f5ac6b17d1a3ec1336a89225264923fc @@ -1,89 +1,89 @@ -ephp:S103"KSplit this 121 characters long line (which is greater than 120 authorized).( -`php:S103"KSplit this 132 characters long line (which is greater than 120 authorized).(Ƌ -ephp:S103"KSplit this 127 characters long line (which is greater than 120 authorized).( -`php:S103"KSplit this 131 characters long line (which is greater than 120 authorized).(ƺ -_php:S103"KSplit this 145 characters long line (which is greater than 120 authorized).(Ѱ -`php:S103"KSplit this 146 characters long line (which is greater than 120 authorized).( -ephp:S103"KSplit this 121 characters long line (which is greater than 120 authorized).(҈ -`php:S103"KSplit this 124 characters long line (which is greater than 120 authorized).(ⶋ -ephp:S103"KSplit this 124 characters long line (which is greater than 120 authorized).(ɫ -ephp:S103"KSplit this 127 characters long line (which is greater than 120 authorized).( -`php:S103"KSplit this 131 characters long line (which is greater than 120 authorized).(ƺ -ephp:S103"KSplit this 157 characters long line (which is greater than 120 authorized).( -`php:S103"KSplit this 165 characters long line (which is greater than 120 authorized).(ˎ -`php:S103"KSplit this 127 characters long line (which is greater than 120 authorized).( -`php:S103"KSplit this 127 characters long line (which is greater than 120 authorized).( ->php:S108")Either remove or fill this block of code.(奞 -C php:S1781")Write this "Array" keyword in lower case.( -C php:S17811")Write this "Array" keyword in lower case.( -C php:S1781I")Write this "Array" keyword in lower case.( -C php:S1781\")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -D php:S1781")Write this "Array" keyword in lower case.( -3php:S113"'Add a new line at the end of this file. -_ php:S1871"IThis case's code block is the same as the block for the case on line 514.( -s php:S1192""_Define a constant instead of duplicating this literal "정상 동작 되었습니다." 4 times.(䑙" -6 php:S1116 "Remove this empty statement.( -6 php:S1116N"Remove this empty statement.( -6 php:S1116e"Remove this empty statement.( -7 php:S1116"Remove this empty statement.( -7 php:S1116"Remove this empty statement.( -B php:S1862o"(This case duplicates the one on line 90.(٥ -W php:S1793""KSplit this 140 characters long line (which is greater than 120 authorized).(J$ad87f745-a356-41c3-85eb-c096181659ed -php:S103I"KSplit this 128 characters long line (which is greater than 120 authorized).(J$b71c902a-04b3-4b09-8d0b-f73bf1ba771b -php:S103W"KSplit this 167 characters long line (which is greater than 120 authorized).(J$65f37e88-8a3f-49f8-acf6-ebd34413b5a8 -php:S103~"KSplit this 131 characters long line (which is greater than 120 authorized).(J$42e06be6-3adb-4e35-b92c-a1e9e16f9f3a -php:S103"KSplit this 156 characters long line (which is greater than 120 authorized).(J$77ad8ec9-6234-406a-b81a-10047b23e1dc -Yphp:S113"'Add a new line at the end of this file.J$49aea6fe-e25e-47eb-b281-5f5e7b56b22b -b php:S2003"&Replace "include" with "include_once".(DžJ$90b1b89a-634b-4527-b679-5755c627a940 -b php:S2003"&Replace "include" with "include_once".(õJ$1b4e9f0e-1d18-46c0-9ade-7a049ba0dcb1 -a php:S2003"&Replace "include" with "include_once".(GJ$6d890a80-b4f5-487a-8493-adf55d8cb38c -g php:S2003"&Replace "include" with "include_once".(J$a3bc186a-f606-4720-98cb-3838896f1d46 -b php:S2003"&Replace "include" with "include_once".(ضJ$6ee9adb4-807d-4e04-9321-7ec3a62ffc6c -b php:S2003"&Replace "include" with "include_once".(⫁J$9a0a18e7-9c22-43f2-a40b-73f4b8871f3b -g php:S2003"&Replace "include" with "include_once".(ЀϏJ$c3efc439-9d2a-47c8-8e5e-546a9db8adc2 -b php:S2003"&Replace "include" with "include_once".(ЃJ$f330d1f1-0b7b-4e8e-92e9-535af75ada20 -g php:S2003"&Replace "include" with "include_once".(J$bca1b210-6de2-482f-9a38-afb5267b06fb - php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$b3706e44-ddbd-462b-9fe1-3548fa9ae5f1 - php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(DžJ$71224505-da40-4ac0-8b5e-150a455d8d08 - php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(õJ$426f1f6f-acc9-4489-8e41-88a92074b4f1 - php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(GJ$19a30e24-c8f5-4f42-9eda-71c97af6a3e0 - php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(J$69befc42-eb80-4ba3-810c-82fcabd7a3a2 - php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(ضJ$16b7610e-c2a7-4565-ab5f-95c6a88b8fe7 - php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(⫁J$446bf086-75bf-463d-b435-c6bac55c5c22 - php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(ЀϏJ$5c43f841-76a6-476d-9de7-87b80c702ff0 - php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(ЃJ$7d5c8f5f-20ec-4634-ac27-9ea14c3cb77f - php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(J$e5bfd5d7-9d8b-46f3-a167-10c3a391afe0 \ No newline at end of file +oWeb:AvoidCommentedOutCodeCheck "Remove this commented out code.(J$4afa719d-b9df-4e83-a8de-a1966742d4e9 +tWeb:AvoidCommentedOutCodeCheck"Remove this commented out code.(ѶJ$6528103a-915e-4ee6-bb1a-387f1dfadcbc +php:S103"KSplit this 169 characters long line (which is greater than 120 authorized).(J$b4f29df6-8e48-4fd7-b432-d6b76b91b0ee +ephp:S103"KSplit this 157 characters long line (which is greater than 120 authorized).(x81 +php:S103"KSplit this 207 characters long line (which is greater than 120 authorized).(81J$e1410482-60c1-4b98-8168-3543b51f0927 +php:S103("KSplit this 134 characters long line (which is greater than 120 authorized).(ﶅJ$21ed8ee6-9f9c-4830-af5d-290a46862fa9 +php:S1033"KSplit this 134 characters long line (which is greater than 120 authorized).(ݭJ$02ee601a-233a-4825-978f-9381e0334a10 +php:S1037"KSplit this 126 characters long line (which is greater than 120 authorized).(J$5dbfd758-49d1-464e-a27e-830845cab4e9 +php:S103>"KSplit this 140 characters long line (which is greater than 120 authorized).(J$24ea3440-ebdd-4274-ab53-2f3db8900876 +php:S103I"KSplit this 128 characters long line (which is greater than 120 authorized).(J$3008f1d7-ac16-48ee-b20a-da789c867dac +php:S103W"KSplit this 167 characters long line (which is greater than 120 authorized).(J$a540a730-51c1-4d20-a663-b5d61b116cc0 +php:S103~"KSplit this 131 characters long line (which is greater than 120 authorized).(J$0d6465db-8629-498a-ad02-ae05d12f91c9 +php:S103"KSplit this 156 characters long line (which is greater than 120 authorized).(J$3aa113c4-a458-4933-8014-5a05c5e12723 +Yphp:S113"'Add a new line at the end of this file.J$d70fdd27-f5f8-419f-9d9c-4a460eee605d +b php:S2003"&Replace "include" with "include_once".(DžJ$0af02aa0-07c8-4330-b89c-d8c31d95c3da +b php:S2003"&Replace "include" with "include_once".(õJ$5b0b1250-0514-45a4-9c55-de3685beea37 +a php:S2003"&Replace "include" with "include_once".(GJ$8ed7220d-4549-432c-9402-7d4b8692a744 +g php:S2003"&Replace "include" with "include_once".(J$078309f2-3c88-4910-898d-934d4f80b6e6 +b php:S2003"&Replace "include" with "include_once".(ضJ$c7d8e7d9-85f7-4417-8c40-9b2781b79691 +b php:S2003"&Replace "include" with "include_once".(⫁J$7c0b73ae-4d57-4da8-92b8-f66e762a58b3 +g php:S2003"&Replace "include" with "include_once".(ЀϏJ$92f4c23d-f20b-4e58-9a64-0f9df48fafe5 +b php:S2003"&Replace "include" with "include_once".(ЃJ$bc721e41-eec0-422b-a4b5-ca5fd005e0ef +g php:S2003"&Replace "include" with "include_once".(J$523c14b8-045e-4967-a10c-44e2f82bc012 + php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$c18b8b39-e4fe-4877-b1df-e0a777839045 + php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(DžJ$6533008c-ab29-4ab6-9b23-1cb33ec5b065 + php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(õJ$46fe0e8d-eaa4-407b-a655-1c694fc1473b + php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(GJ$4166ef38-2e2a-432f-9e0b-97b04331e29d + php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(J$ccad0d6c-8aea-4bcd-b675-390896b4fd6d + php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(ضJ$bb2f9045-9815-4169-8764-e1e155cb65de + php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(⫁J$7b48a7eb-cc7d-4b70-b105-c3b1ea812434 + php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(ЀϏJ$a0c5556c-ece2-4f83-979c-f5fa3f7f2929 + php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(ЃJ$1f3438a6-5a30-446c-a74a-5c7509fdfd35 + php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.(J$186ffba0-dace-4d54-938f-4b71b7f3d9ca \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/3/7/37af8ab61b5521209dfb77046413f87c5e4895ed b/.idea/sonarlint/issuestore/3/7/37af8ab61b5521209dfb77046413f87c5e4895ed new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/4/7/4714a4eb41b010ff16a0b0d6e1239c2bfe52a965 b/.idea/sonarlint/issuestore/4/7/4714a4eb41b010ff16a0b0d6e1239c2bfe52a965 new file mode 100644 index 0000000..121e542 --- /dev/null +++ b/.idea/sonarlint/issuestore/4/7/4714a4eb41b010ff16a0b0d6e1239c2bfe52a965 @@ -0,0 +1,4 @@ + +NWeb:AvoidCommentedOutCodeCheck"Remove this commented out code.( +IWeb:AvoidCommentedOutCodeCheck"Remove this commented out code.( +3php:S113"'Add a new line at the end of this file. \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/5/0/506ce27b4205c168de6546ae8ee0d23065d27196 b/.idea/sonarlint/issuestore/5/0/506ce27b4205c168de6546ae8ee0d23065d27196 new file mode 100644 index 0000000..4d32d83 --- /dev/null +++ b/.idea/sonarlint/issuestore/5/0/506ce27b4205c168de6546ae8ee0d23065d27196 @@ -0,0 +1,14 @@ + +p php:S1781z")Write this "Array" keyword in lower case.(8Ω1J$5ce0a749-bfc1-455e-9128-51805ac0d78b +q php:S1781")Write this "Array" keyword in lower case.(8Ω1J$06c64a41-5493-4d74-9e3d-6845c72d4289 +q php:S1781")Write this "Array" keyword in lower case.(8Ω1J$efa40e93-a595-4f3f-af89-c9a2ec9373fa +`php:S113"'Add a new line at the end of this file.8Ω1J$0f7616d7-dc6d-4215-a481-f49f6adf5440 + php:S1192"_Define a constant instead of duplicating this literal "정상 동작 되었습니다." 3 times.(䑙"8Ω1J$b2a95e50-21d5-4c28-b0c4-d10996e5f74e +d php:S1116"Remove this empty statement.(8Ω1J$68dba490-dfb7-4aab-9496-fdcf4fd3d883 +d php:S1116"Remove this empty statement.(8Ω1J$1140b8ec-3c03-48fd-8abd-1048484d5ec0 +d php:S1116"Remove this empty statement.(8Ω1J$8f319eed-afb6-47cc-ad20-67c53f0156d7 +aphp:S125"Remove this commented out code.(ؓ8Ω1J$4500d6c5-eeaf-4a44-85b6-f0ef4d19c3b0 + php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(8Ω1J$b4054b7f-a93b-403d-aff8-93e48a87a663 + php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(ܚ8Ω1J$67159570-9703-4efb-be23-b4e0a58413d4 + php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(8Ω1J$2c57a6a7-4963-469d-99ef-c5ea406a096c +}php:S131 "7Add a "case default" clause to this "switch" statement.(8Ω1J$bd74262c-4422-4498-88fb-b4fd3b0eab32 \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/5/1/511551275fbc396506b504a6206e578e548b5625 b/.idea/sonarlint/issuestore/5/1/511551275fbc396506b504a6206e578e548b5625 index 5845322..70c816a 100644 --- a/.idea/sonarlint/issuestore/5/1/511551275fbc396506b504a6206e578e548b5625 +++ b/.idea/sonarlint/issuestore/5/1/511551275fbc396506b504a6206e578e548b5625 @@ -1,44 +1,44 @@ -php:S103Q"KSplit this 130 characters long line (which is greater than 120 authorized).(J$f6e9cef6-f004-4324-a375-b8c792ae6c72 -php:S103j"KSplit this 132 characters long line (which is greater than 120 authorized).(J$7db7ba14-00b9-47b4-8efc-225ad9c3fb9f -php:S103k"KSplit this 131 characters long line (which is greater than 120 authorized).(J$fb33ea83-cffa-4797-acdf-965054becd42 -php:S103l"KSplit this 126 characters long line (which is greater than 120 authorized).(ȳJ$b786abed-1e92-405c-98d7-bb08ce324931 -php:S103"KSplit this 130 characters long line (which is greater than 120 authorized).(J$1cde93b9-e6b8-46d5-a86b-ad1224c58f56 -php:S103"KSplit this 132 characters long line (which is greater than 120 authorized).(J$50403eaf-e7d7-499a-895f-09a7caa5e87e -php:S103"KSplit this 131 characters long line (which is greater than 120 authorized).(J$8c14af45-3608-439a-90fb-bde0c0088701 -php:S103"KSplit this 126 characters long line (which is greater than 120 authorized).(ȳJ$f17decc3-10b4-4c99-b6aa-db03f0bc506a -php:S103"KSplit this 132 characters long line (which is greater than 120 authorized).(J$af4e1d37-e485-43a8-8d88-0a85befcd0cf -php:S103"KSplit this 131 characters long line (which is greater than 120 authorized).(J$d1a6ca6e-8309-4c36-ae67-3babe479bb0d -php:S103"KSplit this 126 characters long line (which is greater than 120 authorized).(ȳJ$264a143b-d920-4bbd-bb7c-2218b5e71b78 -i php:S1781Z")Write this "Array" keyword in lower case.(J$6e510c72-9203-4d94-80a0-fef5e34f8c4d -i php:S1781r")Write this "Array" keyword in lower case.(J$f6c69b25-e815-460f-86e0-d384f385ca2c -i php:S1781u")Write this "Array" keyword in lower case.(J$54d4cf6f-b204-4be3-84dc-da9b8bae5f94 -i php:S1781x")Write this "Array" keyword in lower case.(J$d7848c2c-da52-4703-9927-2efeb8f33807 -j php:S1781")Write this "Array" keyword in lower case.(J$9a73b988-60d1-42d8-aba1-b34d0bf68823 -j php:S1781")Write this "Array" keyword in lower case.(J$94decdad-cb5b-4867-aaa6-667696a56a43 -j php:S1781")Write this "Array" keyword in lower case.(J$874c8ed9-d3a0-446a-bf31-184f8bdc9e3f -j php:S1781")Write this "Array" keyword in lower case.(J$9924f47b-34f8-4b99-b436-34393f2499a4 -j php:S1781")Write this "Array" keyword in lower case.(J$b3d3b113-d9a0-4f0a-afc7-e6832de180c2 -j php:S1781")Write this "Array" keyword in lower case.(J$565e0d1e-f73b-4a78-a075-6c02c67f72b2 -j php:S1781")Write this "Array" keyword in lower case.(J$5db9cfe1-cd07-4c02-ab30-8779625b6e8f -j php:S1781")Write this "Array" keyword in lower case.(J$a52c0a75-fef5-48bc-b264-21c408224cd6 -Yphp:S113"'Add a new line at the end of this file.J$6d0d065f-652c-4b73-ae13-2f422ba92765 - php:S1192)"_Define a constant instead of duplicating this literal "정상 동작 되었습니다." 3 times.(J$93b223fc-0854-4e65-9bcd-41e18ce9169b -\ php:S1116&"Remove this empty statement.(J$3f335094-ab86-4b91-a0af-7257f70d018b -] php:S1116"Remove this empty statement.(J$9511a4c1-a2cf-4c71-8a5b-4090b2143836 -] php:S1116"Remove this empty statement.(J$d9332a56-94c0-435e-b960-fe33e3bd29f2 -Yphp:S125'"Remove this commented out code.(ЏJ$75c501c5-5f6a-4d29-859e-ceb0c4c7b418 -_php:S125"Remove this commented out code.(ױJ$c9da32c5-590b-4a0c-a20f-2dbdcb386b33 -Zphp:S125"Remove this commented out code.(ЏJ$d2167d4d-4848-42bc-832c-f7ef4edab658 -_php:S125"Remove this commented out code.(J$afa523f8-94ab-48e7-81bb-0714c7e7ebb2 -_php:S125"Remove this commented out code.(ױJ$fee53cab-dcc0-48fe-9f1b-04920d8bf36c -Zphp:S125"Remove this commented out code.(ЏJ$a432ff13-2ce7-4089-b697-8042c5fa06c9 -_php:S125"Remove this commented out code.(ױJ$b37d5a69-96c4-4363-b98f-d399e11920fc -jphp:S1211"0Add curly braces around the nested statement(s).(؀J$1498f985-80c1-457b-b142-663202a889f1 -kphp:S121"0Add curly braces around the nested statement(s).(؀J$f4c0ace8-b10a-4b49-a2ca-e9f8f0273aa0 -kphp:S121"0Add curly braces around the nested statement(s).(؀J$3a52a8ac-55f7-4c27-b11f-a59d5c4fe9b4 - php:S4833 "QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$e0960b3c-4a42-477d-a70b-1ac10ec13ac9 +php:S103Q"KSplit this 130 characters long line (which is greater than 120 authorized).(J$f252f16c-9fcd-4f72-93f2-037405a131dd +php:S103j"KSplit this 132 characters long line (which is greater than 120 authorized).(J$a5b7e1a9-c31a-4b68-a904-38d0bbe2b026 +php:S103k"KSplit this 131 characters long line (which is greater than 120 authorized).(J$5cb42ef0-3dad-461a-a80e-57e84a76ecf6 +php:S103l"KSplit this 126 characters long line (which is greater than 120 authorized).(ȳJ$62604736-81b4-4017-b99c-ec200f0cc29e +php:S103"KSplit this 130 characters long line (which is greater than 120 authorized).(J$3baaa07c-091e-4eb0-bb1d-8141313d9d94 +php:S103"KSplit this 132 characters long line (which is greater than 120 authorized).(J$74d784d4-62d5-40ea-85ff-fca1987d6082 +php:S103"KSplit this 131 characters long line (which is greater than 120 authorized).(J$0fae4bf0-8622-4fa7-bad5-2e2fe1090ac9 +php:S103"KSplit this 126 characters long line (which is greater than 120 authorized).(ȳJ$cbeb5209-8e09-4bd9-9d79-3e9d68e0793d +php:S103"KSplit this 132 characters long line (which is greater than 120 authorized).(J$b3e1df83-4461-48a1-a00f-d88cce814263 +php:S103"KSplit this 131 characters long line (which is greater than 120 authorized).(J$f4804bc4-9285-41d1-a3dc-4d9760b73cd4 +php:S103"KSplit this 126 characters long line (which is greater than 120 authorized).(ȳJ$3d566386-f94a-4619-b635-de5fa0eb0162 +i php:S1781Z")Write this "Array" keyword in lower case.(J$0c6a677d-24cb-46ee-a5a6-80fcbfef90ad +i php:S1781r")Write this "Array" keyword in lower case.(J$ebaf4da1-98e9-4d45-9b1c-9b16effacd42 +i php:S1781u")Write this "Array" keyword in lower case.(J$7c7f98e9-54cd-4192-b885-75ae792c81da +i php:S1781x")Write this "Array" keyword in lower case.(J$8447b405-1384-42ac-a9a4-bee71acf4062 +j php:S1781")Write this "Array" keyword in lower case.(J$98064520-5519-4fb1-acec-611d0c446127 +j php:S1781")Write this "Array" keyword in lower case.(J$20cf8388-8f5e-4e1d-a51a-148b8cc4faf5 +j php:S1781")Write this "Array" keyword in lower case.(J$d2cd206b-8518-4682-a324-2b6dc0e5cecc +j php:S1781")Write this "Array" keyword in lower case.(J$1a03b9cb-d09a-48b7-a53b-a2c5f16cddef +j php:S1781")Write this "Array" keyword in lower case.(J$5fc7685a-4a0a-4002-a93d-ae2b57d1c576 +j php:S1781")Write this "Array" keyword in lower case.(J$8722b770-791f-4a3a-9b13-4dd06417c851 +j php:S1781")Write this "Array" keyword in lower case.(J$f49e7730-4bf9-4801-bd80-d17e4c948c7f +j php:S1781")Write this "Array" keyword in lower case.(J$c22c7b1b-6f92-425c-b19c-25eb8f4586a6 +Yphp:S113"'Add a new line at the end of this file.J$60728e23-1a3f-45c7-9591-6823c9cdbbf5 + php:S1192)"_Define a constant instead of duplicating this literal "정상 동작 되었습니다." 3 times.(J$900475a5-cc75-418a-9415-6a9400cdb370 +\ php:S1116&"Remove this empty statement.(J$f6633d39-dbfd-4467-9889-c68ffe2f7ea3 +] php:S1116"Remove this empty statement.(J$ba02121a-3e6b-42ed-a80e-e77799728624 +] php:S1116"Remove this empty statement.(J$04c4e3ed-bdeb-4aba-9328-f2a0e9d8910d +Yphp:S125'"Remove this commented out code.(ЏJ$4bb6f2a1-67e9-4a93-bf2e-acf63f078583 +_php:S125"Remove this commented out code.(ױJ$5fd528a6-6cfb-43cd-a057-97413c4be4fb +Zphp:S125"Remove this commented out code.(ЏJ$bb1890af-358a-4f64-b19b-5e2217e1093a +_php:S125"Remove this commented out code.(J$66f0178a-6faf-4de4-9f91-88ad54ab42ac +_php:S125"Remove this commented out code.(ױJ$713f1fdc-18e3-4a41-8f6e-b1f70c8fb745 +Zphp:S125"Remove this commented out code.(ЏJ$5dc55447-a387-477b-b0f1-067621f3c46c +_php:S125"Remove this commented out code.(ױJ$4400a72f-4147-495f-a840-fccdad6985cd +jphp:S1211"0Add curly braces around the nested statement(s).(؀J$c1932acc-2409-4fdf-a83a-b2699d4678b4 +kphp:S121"0Add curly braces around the nested statement(s).(؀J$1f9d4efc-cfcc-4dd3-8150-0898acac2da5 +kphp:S121"0Add curly braces around the nested statement(s).(؀J$7c051e23-7044-42ce-b3eb-2629068dd4fe + php:S4833 "QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$d6d0cb7a-06d9-4338-a13e-a6929f2e14e1  php:S4833 -"QReplace "include_once" with namespace import mechanism through the "use" keyword.(ܚJ$eebf9d03-11cf-4b21-a81d-fbd575e22183 - php:S4833 "QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$7ae45e3a-8a23-443d-84af-45b71d55b622 -vphp:S131"7Add a "case default" clause to this "switch" statement.(J$cf522f47-5c94-4094-a24a-152dc6f29b87 \ No newline at end of file +"QReplace "include_once" with namespace import mechanism through the "use" keyword.(ܚJ$d069791f-91a4-494c-9c27-f72ce95bec71 + php:S4833 "QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$ea9f2424-48c0-4748-89b6-72a147c111df +vphp:S131"7Add a "case default" clause to this "switch" statement.(J$6c742bc9-a370-4f5f-bfca-9e1f7712d681 \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/7/b/7b4c396d650b291c80d654c1ef7134d97c208db6 b/.idea/sonarlint/issuestore/7/b/7b4c396d650b291c80d654c1ef7134d97c208db6 new file mode 100644 index 0000000..469be76 --- /dev/null +++ b/.idea/sonarlint/issuestore/7/b/7b4c396d650b291c80d654c1ef7134d97c208db6 @@ -0,0 +1,3 @@ + +3php:S113"'Add a new line at the end of this file. +f php:S4833"QReplace "require_once" with namespace import mechanism through the "use" keyword.( \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/7/f/7f5a5c9663643d4c11bf16ae3de896ce271e9509 b/.idea/sonarlint/issuestore/7/f/7f5a5c9663643d4c11bf16ae3de896ce271e9509 new file mode 100644 index 0000000..5dbc4a6 --- /dev/null +++ b/.idea/sonarlint/issuestore/7/f/7f5a5c9663643d4c11bf16ae3de896ce271e9509 @@ -0,0 +1,2 @@ + +Yphp:S113"'Add a new line at the end of this file.J$6eaee28e-c136-43b3-9973-f7b42bdefd0d \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/8/0/806b045f1c9e62be2771054b6ad277951dff458f b/.idea/sonarlint/issuestore/8/0/806b045f1c9e62be2771054b6ad277951dff458f new file mode 100644 index 0000000..525347f --- /dev/null +++ b/.idea/sonarlint/issuestore/8/0/806b045f1c9e62be2771054b6ad277951dff458f @@ -0,0 +1,37 @@ + +yphp:S115"`Rename this constant "_APP_NAME_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(ȷ +uphp:S115"aRename this constant "_ROOT_PATH_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +zphp:S115"aRename this constant "_CONF_PATH_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +yphp:S115"`Rename this constant "_LIB_PATH_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(㔸 +xphp:S115 "_Rename this constant "_UP_PATH_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +rphp:S115"^Rename this constant "_DOMAIN_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +uphp:S115"aRename this constant "_SITE_PATH_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +tphp:S115"`Rename this constant "_SITE_URL_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +xphp:S115"eRename this constant "_SITE_INC_PATH_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(Z +}php:S115"dRename this constant "_SITE_INC_URL_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +zphp:S115"aRename this constant "_HOME_PATH_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +yphp:S115"`Rename this constant "_HOME_URL_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(ª– +~php:S115"eRename this constant "_HOME_INC_PATH_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(ȱ +xphp:S115"dRename this constant "_HOME_INC_URL_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +yphp:S115"`Rename this constant "_ADM_PATH_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(܃ +xphp:S115"_Rename this constant "_ADM_URL_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +}php:S115"dRename this constant "_ADM_INC_PATH_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +wphp:S115"cRename this constant "_ADM_INC_URL_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +yphp:S115 "`Rename this constant "_SVC_PATH_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(؜ +sphp:S115!"_Rename this constant "_SVC_URL_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(텹 +wphp:S115""dRename this constant "_SVC_INC_PATH_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(o +|php:S115#"cRename this constant "_SVC_INC_URL_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +xphp:S115&"dRename this constant "_SINGLE_LOGIN_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(ԅŰ +zphp:S115D"aRename this constant "_SESS_PATH_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(σ +tphp:S115N"`Rename this constant "_USE_MODE_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(ʧ +~php:S115W"eRename this constant "_COOKIE_DOMAIN_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +~php:S115Y"eRename this constant "_COOKIE_EXPIRE_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(ۖ +|php:S115["cRename this constant "_COOKIE_PATH_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(Ҍ +tphp:S115^"`Rename this constant "_AUTH_KEY_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.(ߪ +uphp:S115a"aRename this constant "_SDATENULL_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +zphp:S115b"aRename this constant "_FDATENULL_" to match the regular expression ^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$.( +8php:S125/"Remove this commented out code.(ݕ +Iphp:S121E"0Add curly braces around the nested statement(s).( +f php:S4833e"QReplace "include_once" with namespace import mechanism through the "use" keyword.( +f php:S4833h"QReplace "include_once" with namespace import mechanism through the "use" keyword.( +k php:S4833k"QReplace "include_once" with namespace import mechanism through the "use" keyword.( \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/9/1/9187a16dfed596874548fa079f89d5e9b5286fcf b/.idea/sonarlint/issuestore/9/1/9187a16dfed596874548fa079f89d5e9b5286fcf new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/9/e/9ee0c53e411ae30e9aa7e0bfcd2eefd80a8b5581 b/.idea/sonarlint/issuestore/9/e/9ee0c53e411ae30e9aa7e0bfcd2eefd80a8b5581 new file mode 100644 index 0000000..7514caf --- /dev/null +++ b/.idea/sonarlint/issuestore/9/e/9ee0c53e411ae30e9aa7e0bfcd2eefd80a8b5581 @@ -0,0 +1,19 @@ + + Web:S6848"Avoid non-native interactive elements. If using native HTML is not possible, add an appropriate role and support for tabbing, mouse, keyboard, and touch inputs to an interactive content element.( +IWeb:AvoidCommentedOutCodeChecky"Remove this commented out code.( +NWeb:AvoidCommentedOutCodeCheck|"Remove this commented out code.(ö +JWeb:AvoidCommentedOutCodeCheck"Remove this commented out code.( +3php:S113"'Add a new line at the end of this file. +@ php:S2003"&Replace "include" with "include_once".( +; php:S2003]"&Replace "include" with "include_once".(ӑ +; php:S2003a"&Replace "include" with "include_once".( +; php:S2003~"&Replace "include" with "include_once".( +e php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.( +k php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.( +k php:S4833 "QReplace "include_once" with namespace import mechanism through the "use" keyword.( +f php:S4833"LReplace "include" with namespace import mechanism through the "use" keyword.( +a php:S4833]"LReplace "include" with namespace import mechanism through the "use" keyword.(ӑ +a php:S4833a"LReplace "include" with namespace import mechanism through the "use" keyword.( +a php:S4833~"LReplace "include" with namespace import mechanism through the "use" keyword.( +l php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(ـ +g php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.( \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/c/d/cdaa167bac242b837f9c999bede6e14a85a86af6 b/.idea/sonarlint/issuestore/c/d/cdaa167bac242b837f9c999bede6e14a85a86af6 index 19d1c38..32369a5 100644 --- a/.idea/sonarlint/issuestore/c/d/cdaa167bac242b837f9c999bede6e14a85a86af6 +++ b/.idea/sonarlint/issuestore/c/d/cdaa167bac242b837f9c999bede6e14a85a86af6 @@ -1,22 +1,22 @@ -sWeb:TableWithoutCaptionCheckz" Add a description to this table.(J$c219430d-e14b-45c3-af80-bdded08a9984 -d Web:S1827|")Remove this deprecated "width" attribute.(J$f4d23cc4-5d40-4e25-9b1f-d7dbc0b90838 -i Web:S1827}")Remove this deprecated "width" attribute.(ŒӡJ$7dba607a-6ad5-4253-9985-f80ea2233d11 -i Web:S1827~")Remove this deprecated "width" attribute.(ȏJ$ed509ede-8271-4585-8beb-a9b9dd550e72 -i Web:S1827")Remove this deprecated "width" attribute.(ŒӡJ$191d440f-9815-4e65-bad5-f0db4234a234 -j Web:S1827")Remove this deprecated "width" attribute.(ȏJ$7cd68d01-d839-4668-bc33-2fa8607ea9b7 -j Web:S1827")Remove this deprecated "width" attribute.(ȏJ$06f2970f-e477-464e-8318-66561cb166e1 -j Web:S1827")Remove this deprecated "width" attribute.(J$06fa90ec-89b3-4cc5-9748-1d8d8e19758a -php:S103"KSplit this 387 characters long line (which is greater than 120 authorized).(8Ę1J$c2ea6b4f-3120-479f-ba9b-0409fb42ce2e -php:S103"KSplit this 269 characters long line (which is greater than 120 authorized).(״J$54123c61-2bcc-427a-a101-d7db775987f6 -php:S103"KSplit this 269 characters long line (which is greater than 120 authorized).(֥J$496f0d35-994e-47c9-80a7-c9bcddd957a3 -php:S103"KSplit this 268 characters long line (which is greater than 120 authorized).(8ӎ1J$fa84e1ca-be63-4b26-a5a5-8c8153064626 -php:S103"KSplit this 269 characters long line (which is greater than 120 authorized).(J$afafacba-4c60-4984-ac80-6dc2a06a57b7 -Yphp:S113"'Add a new line at the end of this file.J$c71bcc4f-3e72-46a1-bf89-76156a8d529e -a php:S20034"&Replace "include" with "include_once".(ůJ$2fc1edd7-7e01-43d2-8dd9-bfe27da8f1ee - php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$ee62dfab-13af-432d-a616-124477e6b631 - php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$c0c75997-f486-48e2-9bc2-4794dd782208 - php:S4833 "QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$5c71d098-a9de-4e68-b1b8-cf8ac885362a - php:S48334"LReplace "include" with namespace import mechanism through the "use" keyword.(ůJ$7517ecbc-8846-4071-8cff-700971b9976f - php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(ـJ$440c1153-eda6-4c38-be1b-d7fd57e544ac - php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$a08f4984-8007-4564-9a2f-07fcf5bec23b \ No newline at end of file +sWeb:TableWithoutCaptionCheckz" Add a description to this table.(J$8ac670ff-840d-4f5b-8d1d-d2816ee8a292 +d Web:S1827|")Remove this deprecated "width" attribute.(J$df1269b0-aab1-4b7f-bfb4-da9d891e3021 +i Web:S1827}")Remove this deprecated "width" attribute.(ŒӡJ$71b4f185-3826-49d8-aeef-3a9877e47574 +i Web:S1827~")Remove this deprecated "width" attribute.(ȏJ$1fd5398c-f2f4-473b-81d1-092296b7581a +i Web:S1827")Remove this deprecated "width" attribute.(ŒӡJ$f41633b9-36a2-43c8-87fa-69a9c1fe5eac +j Web:S1827")Remove this deprecated "width" attribute.(ȏJ$077897f8-9d8b-4cc4-8846-ba05609b5829 +j Web:S1827")Remove this deprecated "width" attribute.(ȏJ$e6446ea1-894a-489b-8af2-0ac415a25aae +j Web:S1827")Remove this deprecated "width" attribute.(J$9a9e6562-ee28-4d55-9d70-e88b022e92bb +lphp:S103"KSplit this 246 characters long line (which is greater than 120 authorized).(81 +gphp:S103"KSplit this 269 characters long line (which is greater than 120 authorized).(״81 +gphp:S103"KSplit this 269 characters long line (which is greater than 120 authorized).(֥81 +gphp:S103"KSplit this 239 characters long line (which is greater than 120 authorized).(81 +php:S103"KSplit this 269 characters long line (which is greater than 120 authorized).(J$7ea27bba-2ffc-439a-a39b-b61c8cdad11c +Yphp:S113"'Add a new line at the end of this file.J$e188c86c-50cc-49b1-ac04-357f4849a72f +a php:S20034"&Replace "include" with "include_once".(ůJ$f1d67bae-5bd5-498e-89d0-d637e8adf3aa + php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$6dc2312e-1efb-483f-a102-0a1e61c1ff82 + php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$511fe7f3-8e96-4197-bd5f-8bd1ad06e0d3 + php:S4833 "QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$f9bcecde-e1c8-4867-be9b-4ea141e78dc0 + php:S48334"LReplace "include" with namespace import mechanism through the "use" keyword.(ůJ$06ab7c2d-f0d6-419d-b460-059bc849dd90 + php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(ـJ$791044b0-d9ad-490b-8e7c-7d54ba6355d7 + php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$4c076494-2818-4046-90e7-55f12e381289 \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/f/9/f909f1873ad9b00d3aadf1e34a760d41d322c9fa b/.idea/sonarlint/issuestore/f/9/f909f1873ad9b00d3aadf1e34a760d41d322c9fa new file mode 100644 index 0000000..e69de29 diff --git a/.idea/sonarlint/issuestore/f/a/fa48dc62db7f51377363d747a87d1ef772ce2b85 b/.idea/sonarlint/issuestore/f/a/fa48dc62db7f51377363d747a87d1ef772ce2b85 index 6b39d0a..d3858b0 100644 --- a/.idea/sonarlint/issuestore/f/a/fa48dc62db7f51377363d747a87d1ef772ce2b85 +++ b/.idea/sonarlint/issuestore/f/a/fa48dc62db7f51377363d747a87d1ef772ce2b85 @@ -1,16 +1,16 @@ -{Web:AvoidCommentedOutCodeCheck "Remove this commented out code.(81J$42326380-3804-402f-924d-d86c773d1676 -tWeb:AvoidCommentedOutCodeCheck "Remove this commented out code.(J$f87bf530-62d4-4919-952a-9a66adc244fa -vWeb:AvoidCommentedOutCodeCheck"Remove this commented out code.(ŋ81J$ed9075c5-3e58-463b-94d2-f2416229e8ee -{Web:AvoidCommentedOutCodeCheck"Remove this commented out code.(׈8Ɯ1J$36eafce0-08c7-4b75-a927-a3e8bade9dc3 -{Web:AvoidCommentedOutCodeCheck"Remove this commented out code.(ن8Ɯ1J$7dbc0816-197f-41e7-8a4e-33014d6a7442 -{Web:AvoidCommentedOutCodeCheck"Remove this commented out code.(ީ8Ɯ1J$8b077ed8-6451-4b77-9474-3d08cae66b79 -oWeb:AvoidCommentedOutCodeCheck"Remove this commented out code.(J$2924e92a-a697-47ae-90f4-f8e643331af1 -vWeb:AvoidCommentedOutCodeCheck#"Remove this commented out code.(81J$1e9e116c-525c-4500-a9ad-299cfada43b4 -vWeb:AvoidCommentedOutCodeCheck$"Remove this commented out code.(81J$7a276764-ac43-4e65-9df1-b17f20d99de5 -{Web:AvoidCommentedOutCodeCheck'"Remove this commented out code.(ö81J$7cb56c3e-ac0c-4d73-ba9b-061acc55ddbd -vWeb:AvoidCommentedOutCodeCheck("Remove this commented out code.(81J$74b97970-c819-4d88-80b9-6eb99eacfe29 -{Web:AvoidCommentedOutCodeCheck+"Remove this commented out code.(ö81J$698ffcc2-a72c-4892-93dc-c100368da15c -vWeb:AvoidCommentedOutCodeCheck,"Remove this commented out code.(81J$a03623e7-4974-4290-aaa1-27e71592bd84 -Yphp:S113"'Add a new line at the end of this file.J$497e37e2-3d58-4d09-a589-cdf6418e245c - php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$156bab27-a20f-4679-a8f5-fe914d0aba4f \ No newline at end of file +{Web:AvoidCommentedOutCodeCheck "Remove this commented out code.(81J$0c0699e9-5983-4e13-b7e6-867af794e68b +tWeb:AvoidCommentedOutCodeCheck "Remove this commented out code.(J$4c2b7fc7-fb3e-45c8-873f-2d67673f2f4b +vWeb:AvoidCommentedOutCodeCheck"Remove this commented out code.(ŋ81J$fea09189-a92e-4be6-98f8-5634daa62e84 +{Web:AvoidCommentedOutCodeCheck"Remove this commented out code.(׈8Ɯ1J$20167be6-a8b7-4d56-a02d-3042aaf38744 +{Web:AvoidCommentedOutCodeCheck"Remove this commented out code.(ن8Ɯ1J$07c50b21-e148-457f-8611-c78192042263 +{Web:AvoidCommentedOutCodeCheck"Remove this commented out code.(ީ8Ɯ1J$944db44c-63ab-4144-86cf-acaaa4c4a968 +oWeb:AvoidCommentedOutCodeCheck"Remove this commented out code.(J$59bbeaae-b4ed-435c-89a6-613a96a20016 +vWeb:AvoidCommentedOutCodeCheck#"Remove this commented out code.(81J$88f460b3-6ff2-441b-a904-74914fe1d8c0 +vWeb:AvoidCommentedOutCodeCheck$"Remove this commented out code.(81J$cf94c6f9-22fb-4a5c-a375-bc4620205746 +{Web:AvoidCommentedOutCodeCheck'"Remove this commented out code.(ö81J$4f5d0771-8b6c-49e9-aded-8ab82e6bd64b +vWeb:AvoidCommentedOutCodeCheck("Remove this commented out code.(81J$14e4964d-dfa4-4dd8-9bec-4339c87a02a5 +{Web:AvoidCommentedOutCodeCheck+"Remove this commented out code.(ö81J$d28a2a5d-d6f5-4c5b-bb50-54a60a40bedf +vWeb:AvoidCommentedOutCodeCheck,"Remove this commented out code.(81J$594fc262-7f6d-4a8b-9f67-13a1b11e7276 +Yphp:S113"'Add a new line at the end of this file.J$4978bf45-1dca-4b8f-9694-398187b87a98 + php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$8ddd9cb0-f376-43cd-a050-66278c403e8e \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/f/d/fde79b6f9096fc58551697e656ab8dfbbf18f854 b/.idea/sonarlint/issuestore/f/d/fde79b6f9096fc58551697e656ab8dfbbf18f854 new file mode 100644 index 0000000..ae9b4a8 --- /dev/null +++ b/.idea/sonarlint/issuestore/f/d/fde79b6f9096fc58551697e656ab8dfbbf18f854 @@ -0,0 +1,16 @@ + +{Web:AvoidCommentedOutCodeCheck "Remove this commented out code.(81J$9464745c-f1ca-484a-bb68-e32bbbf442e2 +tWeb:AvoidCommentedOutCodeCheck "Remove this commented out code.(J$54198267-b359-4994-9478-116dd8a741d3 +vWeb:AvoidCommentedOutCodeCheck"Remove this commented out code.(ŋ81J$12bf0cd8-970e-499c-8b1c-384db4bd47bd +{Web:AvoidCommentedOutCodeCheck"Remove this commented out code.(׈8Ɯ1J$d7e31a65-8d2b-4777-bbb6-b04f5bce82ee +{Web:AvoidCommentedOutCodeCheck"Remove this commented out code.(ن8Ɯ1J$49bf1c07-0e03-4614-8016-c5d97062c25c +{Web:AvoidCommentedOutCodeCheck"Remove this commented out code.(ީ8Ɯ1J$93145234-29f1-4d0b-86d1-580b65b24a70 +oWeb:AvoidCommentedOutCodeCheck"Remove this commented out code.(J$58ea6ed3-12b7-44d0-9b0a-ed73a5657a19 +vWeb:AvoidCommentedOutCodeCheck#"Remove this commented out code.(81J$bd59900e-5dd0-4a2c-9f3c-138bbfc0a717 +vWeb:AvoidCommentedOutCodeCheck$"Remove this commented out code.(81J$de2c4110-a5a5-46ef-8442-b3fe0d1d769a +{Web:AvoidCommentedOutCodeCheck'"Remove this commented out code.(ö81J$1768b790-c01c-4f38-b018-e0bd941cb3ca +vWeb:AvoidCommentedOutCodeCheck("Remove this commented out code.(81J$2b063564-5242-4c2b-b91e-3ba553fbb704 +{Web:AvoidCommentedOutCodeCheck+"Remove this commented out code.(ö81J$5dc4f30a-19a5-4c8a-baa6-0dfbc11aa4b3 +vWeb:AvoidCommentedOutCodeCheck,"Remove this commented out code.(81J$a7aca6ad-544c-48ef-87bc-10c0c879582f +Yphp:S113"'Add a new line at the end of this file.J$e61bfb01-5931-442e-b93f-b92375e20c19 + php:S4833"QReplace "include_once" with namespace import mechanism through the "use" keyword.(J$bd94a96f-6455-44f7-b110-800e54612acd \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/f/f/ff4caf8a71f28c32739b5561e3082208fd397365 b/.idea/sonarlint/issuestore/f/f/ff4caf8a71f28c32739b5561e3082208fd397365 new file mode 100644 index 0000000..7374aec --- /dev/null +++ b/.idea/sonarlint/issuestore/f/f/ff4caf8a71f28c32739b5561e3082208fd397365 @@ -0,0 +1,2 @@ + +3php:S113"'Add a new line at the end of this file. \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb index a81eb4c..e839a6f 100644 --- a/.idea/sonarlint/issuestore/index.pb +++ b/.idea/sonarlint/issuestore/index.pb @@ -100,4 +100,28 @@ l  Q.idea/sonarlint/securityhotspotstore/9/6/961998ca1a9275fd6584098a3ca77b3ba90394b3,3\e\3e4d73edffccbc4f02bb12696ceb4730d4675644 c -3home_dir/www/ksvc/inc/css/scss/component/_form.scss,0\a\0a400853adbf4e029ab2c2d410c62555546f10bc \ No newline at end of file +3home_dir/www/ksvc/inc/css/scss/component/_form.scss,0\a\0a400853adbf4e029ab2c2d410c62555546f10bc +e +5home_dir/www/ksvc/prod/cnt_ct_worker/cnt_ct_worker.js,f\9\f909f1873ad9b00d3aadf1e34a760d41d322c9fa +\ +,home_dir/www/ksvc/prod/reg_plan/reg_plan.php,0\1\019dba2e3e3ca39be57cdeda0181255f2a108089 +n +>home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.ajax.php,5\0\506ce27b4205c168de6546ae8ee0d23065d27196 +K +home_dir/www/common.inc.php,7\b\7b4c396d650b291c80d654c1ef7134d97c208db6 +O +home_dir/config/html_config.php,8\0\806b045f1c9e62be2771054b6ad277951dff458f +b +2home_dir/www/ksvc/insp/reg_insp_qc/reg_insp_qc.php,9\e\9ee0c53e411ae30e9aa7e0bfcd2eefd80a8b5581 +Q +!home_dir/www/include/js/common.js,3\7\37af8ab61b5521209dfb77046413f87c5e4895ed +o +?home_dir/www/ksvc/site/sts_order_prod/popComponent/isWorker.php,4\7\4714a4eb41b010ff16a0b0d6e1239c2bfe52a965 +p +@home_dir/www/ksvc/site/sts_order_prod/sts_order_pop_util.inc.php,f\d\fde79b6f9096fc58551697e656ab8dfbbf18f854 +l +home_dir/www/ksvc/site/sts_order_prod/reg_prod_result.ajax.php,5\0\506ce27b4205c168de6546ae8ee0d23065d27196 +K +home_dir/www/common.inc.php,7\b\7b4c396d650b291c80d654c1ef7134d97c208db6 +O +home_dir/config/html_config.php,8\0\806b045f1c9e62be2771054b6ad277951dff458f +b +2home_dir/www/ksvc/insp/reg_insp_qc/reg_insp_qc.php,9\e\9ee0c53e411ae30e9aa7e0bfcd2eefd80a8b5581 +Q +!home_dir/www/include/js/common.js,3\7\37af8ab61b5521209dfb77046413f87c5e4895ed +o +?home_dir/www/ksvc/site/sts_order_prod/popComponent/isWorker.php,4\7\4714a4eb41b010ff16a0b0d6e1239c2bfe52a965 +p +@home_dir/www/ksvc/site/sts_order_prod/sts_order_pop_util.inc.php,f\d\fde79b6f9096fc58551697e656ab8dfbbf18f854 +l + { + let data = e.target.result; + let workbook = XLSX.read(data, { type: 'binary' }); + + workbook.SheetNames.forEach((sheetName) => { + let rows = XLSX.utils.sheet_to_json(workbook.Sheets[sheetName], { header:1 }); + console.log(rows); + rows.slice(1).forEach((row,index) => { + let rowToAdd = { + INSP_ITEM: row[0], + INSP_NAME: row[1], + INSP_METH: row[2], + USEFLAG: row[3], + _STATUS_: "I" + }; + console.log('행추가 ', rowToAdd); + Tb_insp.tbList.addRow(rowToAdd); + }); + }); + }; + reader.readAsBinaryString(file); + }); + + + // 추가 ["click", "keypress"].forEach((evt) => { this.addBtn.addEventListener(evt, () => { - this.addRow && this.addRow(); + this.addRow && this.addRow() && this.addRow(rowToAdd); }); }); // 삭제 diff --git a/home_dir/www/ksvc/base/insp/insp.php b/home_dir/www/ksvc/base/insp/insp.php index 239d556..43400af 100644 --- a/home_dir/www/ksvc/base/insp/insp.php +++ b/home_dir/www/ksvc/base/insp/insp.php @@ -35,6 +35,7 @@ include_once _SVC_INC_PATH_ . "/header.php";
+ @@ -99,5 +100,6 @@ include_once _SVC_INC_PATH_ . "/header.php"; + { const blob = new Blob([data], { diff --git a/home_dir/www/ksvc/base/item/item.js b/home_dir/www/ksvc/base/item/item.js index 44bff1e..142228c 100644 --- a/home_dir/www/ksvc/base/item/item.js +++ b/home_dir/www/ksvc/base/item/item.js @@ -522,7 +522,7 @@ class Tb_routing_class { _this.fileData = JSON.parse(data).data; - console.log(_this.fileData); + if(rowData._STATUS_ !== "I"){ rowData.FILE_NM = _this.fileData.file_name; this.tbList.updateData([ @@ -546,7 +546,7 @@ class Tb_routing_class { ]); } - console.log(this.tbList.getData()); + }else{ kuls_alert(data.msg); } @@ -1501,7 +1501,7 @@ class Tb_pic_class { }, complete: () => { window.clearTimeout(talert); - this.getMainList(); + // this.tbList.clearAlert(); // this.setFilter(); }, @@ -1706,11 +1706,11 @@ class Tb_pic_class { { field: "SID", visible:false}, { field: "FILE_ID", visible:false}, { field: "MAKE_TM", title: "등록일", width: 100, formatter: (cell)=>{ - let dateData = cell.getValue().date.substring(0,10); - if(dateData == '1900-01-01'){ - dateData = ''; - } - return dateData; + // let dateData = cell.getValue().date.substring(0,10); + // if(dateData == '1900-01-01'){ + // dateData = ''; + // } + return cell; } }, { field: "MAKE_USER_ID",title: "등록자", width: 100 }, diff --git a/home_dir/www/ksvc/faclt/reg_faclt_defect/reg_faclt_defect.js b/home_dir/www/ksvc/faclt/reg_faclt_defect/reg_faclt_defect.js index 49d7f70..cc41532 100644 --- a/home_dir/www/ksvc/faclt/reg_faclt_defect/reg_faclt_defect.js +++ b/home_dir/www/ksvc/faclt/reg_faclt_defect/reg_faclt_defect.js @@ -294,13 +294,14 @@ class Tb_facility_class { { formatter: "rownum", title: "NO", width: 50}, { field: "FACLT_NM", title: "설비", width: 150, editor: "input" , editable:(cell)=>{ let val = cell.getData(); return val._STATUS_ === 'I' },}, { field: "FACLT_CD", visible: false, width: 150}, - { field: "DEFECT_DT", title: "발생일", width: 150,editor:'date', editorParams:{ - min:"01/01/2000", // the minimum allowed value for the date picker - max:"02/12/9999", // the maximum allowed value for the date picker - format:"yyyy-MM-dd", // the format of the date value stored in the cell - verticalNavigation:"table"}}, - { field: "DEF_TM", title: "발생시간", width: 150, editor: tb_custom_editor.time }, + // { field: "DEFECT_DT", title: "발생일", width: 150,editor:'date', editorParams:{ + // min:"01/01/2000", // the minimum allowed value for the date picker + // max:"02/12/9999", // the maximum allowed value for the date picker + // format:"yyyy-MM-dd", // the format of the date value stored in the cell + // verticalNavigation:"table"}}, + // { field: "DEF_TM", title: "발생시간", width: 150, editor: tb_custom_editor.time }, { field: "DEFECT_CONTENT", title: "고장내역", width: 300, editor: "input"}, + { field: "DEFECT_DT", title: "발생일", width: 150}, ]; const commonFieldData = { headerSort: true, diff --git a/home_dir/www/ksvc/faclt/reg_faclt_repair/reg_faclt_repair.js b/home_dir/www/ksvc/faclt/reg_faclt_repair/reg_faclt_repair.js index aec2532..856a3a2 100644 --- a/home_dir/www/ksvc/faclt/reg_faclt_repair/reg_faclt_repair.js +++ b/home_dir/www/ksvc/faclt/reg_faclt_repair/reg_faclt_repair.js @@ -299,11 +299,12 @@ class Tb_facility_class { { field: "FACLT_NM", title: "설비", width: 150,editor: "input", editable:(cell)=>{ let val = cell.getData(); return val._STATUS_ === 'I' }, }, { field: "FACLT_CD", visible: false, width: 150}, { field: "REPAIR_NO", visible: false, width: 150}, - { field: "REPAIR_DT", title: "수리일자", width: 150,editor:'date', editorParams: {max:'9999-12-31'} }, { field: "REPAIR_CONTENT", title: "수리내역", width: 150,editor: "input" }, { field: "REPAIR_BP_NM", title: "수리업체", width: 100,editor: "input" }, - { field: "REPAIR_AMT", title: "수리금액", width: 150,editor: "input" }, + { field: "REPAIR_AMT", title: "수리금액", width: 150,editor: "input", formatter:"money", formatterParams:{ decimal:".",precision:0 } }, { field: "REPAIR_TEL_NO", title: "연락처", width: 200,editor: "input"}, + // { field: "REPAIR_DT", title: "수리일자", width: 150,editor:'date', editorParams: {max:'9999-12-31'} }, + { field: "REPAIR_DT", title: "수리일자", width: 150 } ]; const commonFieldData = { headerSort: true, diff --git a/home_dir/www/ksvc/inc/common.ajax.php b/home_dir/www/ksvc/inc/common.ajax.php index 01ffc87..16732ae 100644 --- a/home_dir/www/ksvc/inc/common.ajax.php +++ b/home_dir/www/ksvc/inc/common.ajax.php @@ -1,4 +1,9 @@ $_REQUEST['ITEM_CD'], - // ); - $rst = $baseObj->DB->exec($sql, $params); - - $rows = array(); - if ($rst) { - $retval['code'] = 1; - while ($row = $baseObj->DB->fetch_array($rst)) { - $rows[] = $row; - } - $retval['data'] = $rows; - } - break; - - case "getDefList": - $sql = "USP_P_DEF_RSLT_S20"; - // $params = Array( - // "ITEM_CD" => $_REQUEST['ITEM_CD'], - // ); - $rst = $baseObj->DB->exec($sql, $params); - $rows = array(); - if ($rst) { - $retval['code'] = 1; - while ($row = $baseObj->DB->fetch_array($rst)) { - $rows[] = $row; - } - $retval['data'] = $rows; - } - break; - - - +//토큰 case "memberTokenLogin": if (csrf_check('memberLogin')) { $retval['mesg'] = cUtil\Mlang::getText("정상적인 접근이 아닙니다."); @@ -110,16 +80,9 @@ switch ($_REQUEST['mode']) { $retval['data']['save_id'] = ''; } } - break; - - - - - - - +//로그인 case "memberJoin": $minfo = $baseObj->getMember($_REQUEST['member_id']); if (csrf_check('memberJoin')) { @@ -151,29 +114,15 @@ switch ($_REQUEST['mode']) { $retval['code'] = $baseObj->join($ins_row); $retval['mesg'] = cUtil\Mlang::getText("등록에 실패하였습니다."); } - break; - - - - - - - +//로그아웃 case "memberLogout": $apiObj->pushApi($GLOBALS['_Umem']['member_id'], "종료"); $retval['code'] = $baseObj->logout(); break; - - - - - - - - +//메뉴리스트 case "getSiteMenuList": $mnuObj = new Menu(TB_menu_list); @@ -190,13 +139,12 @@ switch ($_REQUEST['mode']) { } break; - - +//거래처목록 case "getPartnerList": $sql = "USP_B_BIZ_PARTNER_S10"; $params = array( "P_USE_FLG" => "Y", - "P_BP_CD" => "", + "P_BP_CD" => "", "P_PUR_FLG" => "", "P_SAL_FLG" => "" ); @@ -207,16 +155,16 @@ switch ($_REQUEST['mode']) { if ($rst) { $retval['code'] = 1; while ($row = $baseObj->DB->fetch_array($rst)) { - // $row['BP_PRSN_CELL_NO'] = $baseObj->lcrypt->dec_secure($row['BP_PRSN_CELL_NO']); -// $row['BP_PRSN_EMAIL'] = $baseObj->lcrypt->dec_secure($row['BP_PRSN_EMAIL']); -// $row['BP_PRSN_TEL_NO'] = $baseObj->lcrypt->dec_secure($row['BP_PRSN_TEL_NO']); + // $row['BP_PRSN_CELL_NO'] = $baseObj->lcrypt->dec_secure($row['BP_PRSN_CELL_NO']); + // $row['BP_PRSN_EMAIL'] = $baseObj->lcrypt->dec_secure($row['BP_PRSN_EMAIL']); + // $row['BP_PRSN_TEL_NO'] = $baseObj->lcrypt->dec_secure($row['BP_PRSN_TEL_NO']); $rows[] = $row; } $retval['data'] = $rows; } break; - +//사업장 case "getBizareaList": $sql = "USP_B_BIZ_AREA_S10"; $params = Array( @@ -224,10 +172,7 @@ switch ($_REQUEST['mode']) { ,"BP_NM" => "" //거래처명 ,"USEFLAG" => 'Y' ); - - $rst = $baseObj->DB->exec($sql, $params); - $rows = array(); if ($rst) { $retval['code'] = 1; @@ -240,10 +185,57 @@ switch ($_REQUEST['mode']) { break; +// 사원정보 + case 'getWorkerList': + $squl = "USP_B_EMPLOYEE_S10"; + $params = Array( + "EMP_NO" => "", + "P_EMP_NM" => "", + "P_DEPT_CD" => "", + "P_DEPT_NM" => "", + "RET_FLG" => "N" + ); + $rst = $baseObj->DB->exec($squl,$params); + $rows = array(); + if( $rst ){ + $retval['code'] = true; + while( $row = $baseObj->DB->fetch_array($rst) ){ + $rows[] = $row; + }; + $retval['data'] = $rows; + $retval['mesg'] = '정상 동작 되었습니다.'; + }else{ + $retval['code'] = false; + } + break; +// 부서정보 + case 'getDeptList': + $squl = "USP_B_DEPT_S10"; + $params = Array( + "BIZ_AREA_NM" => "", + "DEPT_NM" => "", + "USE_FLG" => "Y" + ); + $rst = $baseObj->DB->exec($squl, $params); + $rows = array(); + if ($rst) { + $retval['code'] = true; + while ($row = $baseObj->DB->fetch_array($rst)) { + $rows[] = $row; + } + ; + $retval['data'] = $rows; + $retval['mesg'] = '정상 동작 되었습니다.'; + } else { + $retval['code'] = false; + } + break; + +//부서 트리 case "getDeptTree": $sql = "USP_B_DEPT_HISTORY_S11"; $params = array( @@ -271,62 +263,42 @@ $retval['data'] = $mnuObj->tree_by_parent($rows, 'DEPT_CD', 'PAR_DEPT_CD', ''); } break; - - // 사원정보 - case 'getWorkerList': - $squl = "USP_B_EMPLOYEE_S10"; - $params = Array( - "EMP_NO" => "", - "P_EMP_NM" => "", - "P_DEPT_CD" => "", - "P_DEPT_NM" => "", - "RET_FLG" => "N" - ); - $rst = $baseObj->DB->exec($squl,$params); - - $rows = array(); - if( $rst ){ - $retval['code'] = true; - while( $row = $baseObj->DB->fetch_array($rst) ){ - $rows[] = $row; - }; - $retval['data'] = $rows; - $retval['mesg'] = '정상 동작 되었습니다.'; - }else{ - $retval['code'] = false; - } - - - - break; - - - // 부서정보 - case 'getDeptList': - $squl = "USP_B_DEPT_S10"; - - $params = Array( - "BIZ_AREA_NM" => "", - "DEPT_NM" => "", - "USE_FLG" => "Y" - ); - $rst = $baseObj->DB->exec($squl, $params); +// 품목 정보 + case "getItemList": + $sql = "USP_B_ITEM_S20"; + $params = Array( + "ITEM_NM" => '', + ); + $rst = $baseObj->DB->exec($sql, $params); $rows = array(); if ($rst) { - $retval['code'] = true; + $retval['code'] = 1; while ($row = $baseObj->DB->fetch_array($rst)) { $rows[] = $row; } - ; $retval['data'] = $rows; - $retval['mesg'] = '정상 동작 되었습니다.'; - } else { - $retval['code'] = false; } break; - // 생산오더(작업지시)별 공정 정보 +// 불량실적 + case "getDefList": + $sql = "USP_P_DEF_RSLT_S20"; + // $params = Array( + // "ITEM_CD" => $_REQUEST['ITEM_CD'], + // ); + $rst = $baseObj->DB->exec($sql, $params); + $rows = array(); + if ($rst) { + $retval['code'] = 1; + while ($row = $baseObj->DB->fetch_array($rst)) { + $rows[] = $row; + } + $retval['data'] = $rows; + } + break; + +// 생산오더(작업지시)별 공정 정보 case 'getOrderList': $squl = "USP_P_WO_S20"; @@ -346,8 +318,7 @@ $retval['data'] = $mnuObj->tree_by_parent($rows, 'DEPT_CD', 'PAR_DEPT_CD', ''); } break; - - // 공정정보 +// 공정정보 case 'getOperList': $squl = "USP_B_OPERATION_S20"; $rst = $baseObj->DB->exec($squl); @@ -365,6 +336,7 @@ $retval['data'] = $mnuObj->tree_by_parent($rows, 'DEPT_CD', 'PAR_DEPT_CD', ''); $retval['code'] = false; } break; + // 특정 품목에 대한 공정정보 case 'getItemOperList': $squl = "USP_B_OPERATION_S30"; @@ -387,7 +359,7 @@ $retval['data'] = $mnuObj->tree_by_parent($rows, 'DEPT_CD', 'PAR_DEPT_CD', ''); } break; - // 설비 정보 +// 설비 정보 case 'getFacilityList': $squl = "USP_B_FACILITY_S10"; $params = Array( @@ -412,7 +384,7 @@ $retval['data'] = $mnuObj->tree_by_parent($rows, 'DEPT_CD', 'PAR_DEPT_CD', ''); } break; - // 검사항목 정보 +// 검사항목 정보 case "getInspList": $sql = "USP_B_INSP_ITEM_S10"; @@ -436,26 +408,7 @@ $retval['data'] = $mnuObj->tree_by_parent($rows, 'DEPT_CD', 'PAR_DEPT_CD', ''); } break; - - case "getBasecodeList": - $where = new DB_Where(); - $where->add("CD.Code_Uid <> ?", $_REQUEST['Bran_Uid']); - if ($_REQUEST['Group_Uid']) { - $where->add("CD.Code_Uid <> ?", $_REQUEST['Group_Uid']); - } - $where->add("BR.Active = ?", "Y"); - $where->add("GR.Active = ?", "Y"); - $rows = $baseObj->getAllBaseCodeList($_REQUEST['Bran_Uid'], $_REQUEST['Group_Uid'] ?: "", "", $where); - - for ($a = 0; $a < count($rows); $a++) { - $rows[$a]['Code_Uid_Old'] = $rows[$a]['Code_Uid']; - } - - $retval['code'] = 1; - $retval['data'] = $rows; - break; - - // 생산실적 오더 공정 정보 +// 생산실적 오더 공정 정보 case 'getRegOrderList': $squl = "USP_P_REG_WO_S20"; @@ -475,7 +428,7 @@ $retval['data'] = $mnuObj->tree_by_parent($rows, 'DEPT_CD', 'PAR_DEPT_CD', ''); } break; - // 생산실적 설비 정보 +// 생산실적 설비 정보 case 'getOrderFacilityList': $squl = "USP_B_REG_FACILITY_S10"; @@ -495,10 +448,27 @@ $retval['data'] = $mnuObj->tree_by_parent($rows, 'DEPT_CD', 'PAR_DEPT_CD', ''); } break; +//기초코드 + case "getBasecodeList": + $where = new DB_Where(); + $where->add("CD.Code_Uid <> ?", $_REQUEST['Bran_Uid']); + if ($_REQUEST['Group_Uid']) { + $where->add("CD.Code_Uid <> ?", $_REQUEST['Group_Uid']); + } + $where->add("BR.Active = ?", "Y"); + $where->add("GR.Active = ?", "Y"); + $rows = $baseObj->getAllBaseCodeList($_REQUEST['Bran_Uid'], $_REQUEST['Group_Uid'] ?: "", "", $where); + for ($a = 0; $a < count($rows); $a++) { + $rows[$a]['Code_Uid_Old'] = $rows[$a]['Code_Uid']; + } + $retval['code'] = 1; + $retval['data'] = $rows; + break; + +//기초코드 case "putBasecode": - $_REQUEST['reqdata'] = json_decode($_REQUEST['reqdata']); $rst = true; foreach ($_REQUEST['reqdata'] as $data) { diff --git a/home_dir/www/ksvc/inc/css/scss/common/_common.scss b/home_dir/www/ksvc/inc/css/scss/common/_common.scss index 77ea747..4930fdd 100644 --- a/home_dir/www/ksvc/inc/css/scss/common/_common.scss +++ b/home_dir/www/ksvc/inc/css/scss/common/_common.scss @@ -128,16 +128,16 @@ button { // } // } -.disabled-btn { - background-color: rgba(255, 255, 255, 0.973); - color: #dddddd; - border-color: #e9e9e9; - cursor: default; +.disabled-btn, button[disabled] { + background-color: rgba(255, 255, 255, 0.973) !important; + color: #dddddd !important; + border-color: #e9e9e9 !important; + cursor: default !important; &:hover { - background-color: rgba(255, 255, 255, 0.973); - color: #dddddd; - border-color: #e9e9e9; + background-color: rgba(255, 255, 255, 0.973) !important; + color: #dddddd !important; + border-color: #e9e9e9 !important; } } diff --git a/home_dir/www/ksvc/inc/css/scss/component/_table.scss b/home_dir/www/ksvc/inc/css/scss/component/_table.scss index 1f9335f..35925bf 100644 --- a/home_dir/www/ksvc/inc/css/scss/component/_table.scss +++ b/home_dir/www/ksvc/inc/css/scss/component/_table.scss @@ -32,7 +32,9 @@ // 테이블 행 .tabulator-row{ background-color: transparent; - border-bottom: solid 1px $gray-002; + border: solid 0.5px $gray-002; + border-left: solid 0.5px transparent; + border-right: solid 0.5px transparent; &:hover{ background-color: $gray-003; @@ -43,12 +45,27 @@ &.remove-row{ background-color: $red; } + &.edit-row{ + background-color: #d2ddff; + } + &.blank-row{ + border: solid 0.5px red + } .tabulator-cell{ border-right: solid 1px $gray-002; + // &.tabulator-editable{ + // background-color: transparent ; + // &::after{ + // content: ""; + + // } + // &:hover{ + // background-color: $gray-003; + // } + // } &.editable-cell, &.tabulator-editable{ - // background-color: rgba(221, 221, 255, 0.548) ; background-color: rgba(255, 253, 221, 0.548) ; &::after{ content: "◥"; @@ -86,7 +103,7 @@ &.tabulator-col-group{ .tabulator-col-group-cols{ - border-top: solid 1px $gray-002; + border-top: solid 1px $gray-004; } } @@ -186,7 +203,7 @@ } .tb-height-full .cont_hfix{ - height: calc(100% - 43px); + height: calc(100% - 44px); margin-top: 10px; overflow: auto; } @@ -238,6 +255,13 @@ } .vue-table { width: 3000px; + position: relative; + + thead{ + position: sticky; + left: 0; + top: 0; + } th{ min-width: auto; @@ -261,6 +285,12 @@ &.width-200{ width: 200px; } + &.width-230{ + width: 230px; + } + &.width-800{ + width: 800px; + } .tabulator-col-group-cols{ display: none; } @@ -301,3 +331,26 @@ } } + +.status-table.vue-table{ + colgroup{ + col{} + } + thead{ + tr{ + th{} + } + } + + tbody{ + tr{ + td{ + &.on{ + background-color: $gray-002; + cursor: pointer; + } + } + } + } +} + diff --git a/home_dir/www/ksvc/inc/css/style.css b/home_dir/www/ksvc/inc/css/style.css index 1b6790c..373ee96 100644 --- a/home_dir/www/ksvc/inc/css/style.css +++ b/home_dir/www/ksvc/inc/css/style.css @@ -102,16 +102,16 @@ button { color: #cf5b5b; } -.disabled-btn { - background-color: rgba(255, 255, 255, 0.973); - color: #dddddd; - border-color: #e9e9e9; - cursor: default; +.disabled-btn, button[disabled] { + background-color: rgba(255, 255, 255, 0.973) !important; + color: #dddddd !important; + border-color: #e9e9e9 !important; + cursor: default !important; } -.disabled-btn:hover { - background-color: rgba(255, 255, 255, 0.973); - color: #dddddd; - border-color: #e9e9e9; +.disabled-btn:hover, button[disabled]:hover { + background-color: rgba(255, 255, 255, 0.973) !important; + color: #dddddd !important; + border-color: #e9e9e9 !important; } .tab-btn { @@ -864,6 +864,12 @@ header .status-menu ul li a { .vue-table { width: 3000px; + position: relative; +} +.vue-table thead { + position: sticky; + left: 0; + top: 0; } .vue-table th { min-width: auto; diff --git a/home_dir/www/ksvc/inc/css/style.css.map b/home_dir/www/ksvc/inc/css/style.css.map new file mode 100644 index 0000000..ca3143f --- /dev/null +++ b/home_dir/www/ksvc/inc/css/style.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["style.css","scss/common/_common.scss","scss/common/_color.scss","scss/component/_header.scss","scss/component/_sidebar.scss","scss/component/_search.scss","scss/component/_scrollbar.scss","scss/component/_table.scss","scss/component/_form.scss","scss/component/_popup.scss","scss/page/_login.scss","scss/page/_main.scss"],"names":[],"mappings":"AAAA,gBAAgB;ACChB;;EAEE,SAAA;EACA,gBAAA;ADCF;;ACEA;EACE,yBAAA;EACA,eAAA;EACA,gBAAA;ADCF;;ACEA;;;;;EAKE,eAAA;ADCF;;ACEA;;;;EAIE,gBAAA;EACA,qBAAA;EACA,SAAA;EACA,UAAA;ADCF;;ACGA;EACE,oBAAA;EACA,uBAAA;EACA,mBAAA;EACA,QAAA;ADAF;;ACGA;EACE,yBAAA;EACA,yBAAA;EACA,iCAAA;EACA,kBAAA;EACA,4BAAA;EAEA,iBAAA;EACA,eAAA;ADDF;;ACGA;EACE,cAAA;EACA,4CAAA;ADAF;;ACGA;EACE,6BAAA;EACA,kBAAA;EACA,yBCpDS;EDqDT,YAAA;EACA,eAAA;ADAF;;ACGA;EACE,uBAAA;EACA,yBAAA;EACA,cC5DS;AF4DX;;ACEA;EACE,yBC/DS;EDgET,6BAAA;EACA,YAAA;ADCF;;ACEA;EACE,uBAAA;EACA,yBAAA;EACA,cCvES;EDwET,kBAAA;EACA,eAAA;ADCF;;ACEA;EACE,YAAA;EACA,qBAAA;EACA,kBAAA;EACA,UAAA;EACA,uBAAA;ADCF;ACCE;EACE,qBAAA;EACA,YAAA;ADCJ;;ACEA;EACE,yBAAA;EACA,YAAA;EACA,yBAAA;EAEA,kBAAA;ADAF;ACEE;EACE,uBAAA;EACA,cAAA;ADAJ;;AC4BA;EACE,uDAAA;EACA,yBAAA;EACA,gCAAA;EACA,0BAAA;ADzBF;AC2BE;EACE,uDAAA;EACA,yBAAA;EACA,gCAAA;ADzBJ;;AC6BA;EACE,uBAAA;EACA,YAAA;EACA,yBAAA;EACA,YAAA;EACA,UAAA;EACA,kBAAA;EACA,eAAA;AD1BF;AC4BE;EACE,yBC/IO;EDgJP,YAAA;AD1BJ;;AC8BA;EACE,gCAAA;AD3BF;;AC8BA;EACE,gCAAA;EACA,+BAAA;AD3BF;;AC+BA;EACE,4BAAA;EACA,2BAAA;EACA,sBAAA;AD5BF;;AC+BA;EACE,0BAAA;EACA,aAAA;EACA,uBAAA;AD5BF;;AC+BA;EACE,yBAAA;EACA,YAAA;EACA,aAAA;EACA,sBAAA;AD5BF;;ACgCE;EACE,kBAAA;AD7BJ;AC+BI;EACE,eAAA;AD7BN;ACgCI;EACE,eAAA;EACA,cAAA;EACA,gBAAA;AD9BN;;ACmCA;EACE,UAAA;EACA,yBAAA;ADhCF;ACmCI;EACE,aAAA;ADjCN;ACoCI;EACE,aAAA;ADlCN;;ACuCA;EACE,QAAA;EACA,gCAAA;ADpCF;ACsCE;EACE,8BAAA;EACA,+BAAA;EACA,6BAAA;EACA,0BAAA;EACA,iBAAA;EACA,uBAAA;EACA,cAAA;EAEA,eAAA;EACA,kBAAA;EACA,eAAA;EACA,gBAAA;ADrCJ;ACuCI;EACE,yBAAA;EACA,YAAA;ADrCN;ACwCI;EACE,yBAAA;EACA,YAAA;ADtCN;;AC0CA;EACE,WAAA;ADvCF;AC0CE;EACE,aAAA;EACA,2BAAA;ADxCJ;AC0CI;EACE,WAAA;EACA,kBAAA;ADxCN;AC0CM;EACE,kBAAA;EACA,UAAA;EACA,QAAA;EACA,mBAAA;ADxCR;AC4CI;EACE,aAAA;AD1CN;;ACqGA;EACE,aAAA;EACA,8BAAA;EACA,gBAAA;EACA,YAAA;ADlGF;ACoGE;EACE,eAAA;EACA,SAAA;EACA,iBAAA;ADlGJ;;ACsGA;EACE,2BAAA;EACA,WAAA;ADnGF;ACqGE;EACE,YAAA;ADnGJ;ACsGE;EACE,WAAA;EACA,WAAA;EACA,qBAAA;ADpGJ;ACsGI;EACE,wBAAA;EACA,yBAAA;EACA,kBAAA;EACA,yBAAA;EACA,2BAAA;ADpGN;ACuGQ;EACE,UAAA;ADrGV;;AC2GA;EACE,WAAA;EACA,gBAAA;ADxGF;;AC0GA;EACE,cAAA;EACA,eAAA;ADvGF;ACwGE;;EAEE,yBAAA;ADtGJ;;AC0GA;EACE,WAAA;EACA,WAAA;ADvGF;;AC2GE;EACE,WAAA;ADxGJ;ACyGI;EACE,UAAA;ADvGN;ACyGI;EACE,UAAA;ADvGN;;AC2GA;EACE,WAAA;EACA,YAAA;ADxGF;ACyGE;EACE,WAAA;EACA,WAAA;ADvGJ;ACyGE;EACE,WAAA;ADvGJ;;AC4GA;EACE,2BAAA;ADzGF;;AC4GA;EACE,0BAAA;ADzGF;;AC4GA;EACE,2BAAA;ADzGF;;AC4GA;EACE,aAAA;EACA,uBAAA;EACA,mBAAA;EACA,YAAA;EACA,WAAA;EACA,kBAAA;ADzGF;AC2GE;EACE,UAAA;EACA,YAAA;EACA,iBAAA;ADzGJ;;AC6GA;EACE,yBAAA;AD1GF;;AC4GA;EACE,yBAAA;ADzGF;;AC2GA;EACE,yBAAA;ADxGF;;AC0GA;EACE,yBAAA;ADvGF;;AC0GA;EACE,gBAAA;ADvGF;;AG5VA;EACE,mBDGS;ECFT,aAAA;EACA,8BAAA;EACA,mBAAA;EACA,YAAA;EACA,iBAAA;AH+VF;;AG5VA;EACE,iBAAA;AH+VF;;AG5VA;EACE,gCAAA;EACA,sBAAA;EACA,2BAAA;EACA,4BAAA;EACA,YAAA;EACA,YAAA;AH+VF;;AG1VA;EACE,gBAAA;EACA,aAAA;EACA,SAAA;AH6VF;;AG1VA;EACE,eAAA;EACA,+BAAA;AH6VF;;AG1VA;EACE,qBAAA;EACA,cDnCS;AFgYX;;AIjYA;EACE,gBAAA;EACA,WAAA;EACA,gBAAA;EACA,YAAA;EACA,+BAAA;EACA,aAAA;EACA,sBAAA;EACA,8BAAA;EACA,iBAAA;AJoYF;;AIjYA;EACE,WAAA;EACA,mBAAA;EACA,mBAAA;AJoYF;;AIlYA;EACE,gBAAA;AJqYF;;AInYA;EACE,kBAAA;AJsYF;;AIpYA;EACE,aAAA;AJuYF;;AIrYA;EACE,SAAA;AJwYF;;AItYA;EACE,kBAAA;EACA,cAAA;EACA,UAAA;EACA,MAAA;EACA,YAAA;EACA,mBAAA;EACA,UAAA;EACA,gBAAA;EACA,iBAAA;EACA,cAAA;AJyYF;;AIvYA;EACE,YAAA;EACA,cAAA;AJ0YF;;AIxYA;EACE,kBAAA;EACA,eAAA;EACA,WAAA;AJ2YF;;AIzYA;EACE,yBAAA;AJ4YF;;AI1YA;EACE,wBAAA;AJ6YF;;AI1YA;EACE,mBAAA;EACA,gBAAA;EACA,iBAAA;EACA,UAAA;AJ6YF;;AI1YA;EACE,WAAA;EACA,YAAA;EACA,0CAAA;EACA,4BAAA;EACA,kBAAA;EACA,yBAAA;EACA,yBAAA;EACA,eAAA;AJ6YF;;AI1YA;EACE,YAAA;EACA,YAAA;AJ6YF;;AI3YA;EACE,gCAAA;AJ8YF;;AI5YA;EACE,gBAAA;AJ+YF;;AI7YA;EACE,YAAA;EACA,oBAAA;EACA,mBAAA;AJgZF;;AI9YA;EACE,cAAA;EACA,6BAAA;EACA,YAAA;AJiZF;;AI/YA;EACE,cAAA;EACA,eAAA;AJkZF;;AIhZA;EACE,cAAA;EACA,eAAA;AJmZF;;AIjZA;EACE,cAAA;EACA,6BAAA;EACA,YAAA;AJoZF;;AIlZA;EACE,cAAA;EACA,6BAAA;EACA,YAAA;AJqZF;;AInZA;EACE,YAAA;AJsZF;;AIpZA;EACE,gBAAA;EACA,gCAAA;AJuZF;;AIrZA;EACE,YAAA;EACA,uBAAA;EACA,kBAAA;EACA,mBAAA;AJwZF;;AItZA;EACE,eAAA;EACA,cAAA;AJyZF;;AIvZA;EACE,yBAAA;AJ0ZF;;AIxZA;EACE,cAAA;AJ2ZF;;AIxZA;EACE,YAAA;AJ2ZF;;AIxZA;EACE,cAAA;EACA,eAAA;EACA,gBAAA;AJ2ZF;;AIxZA;EACE,2BAAA;EACA,4BAAA;EACA,wBAAA;AJ2ZF;;AIzZA;EACE,+CAAA;AJ4ZF;;AI1ZA;EACE,iDAAA;AJ6ZF;;AI3ZA;EACE,oDAAA;AJ8ZF;;AI5ZA;EACE,6CAAA;AJ+ZF;;AI7ZA;EACE,kDAAA;EACA,WAAA;EACA,YAAA;EACA,kBAAA;AJgaF;;AI9ZA;EACE,6CAAA;AJiaF;;AK7kBA;EACE,WAAA;EACA,gBAAA;ALglBF;AK9kBE;EACE,aAAA;EACA,8BAAA;EACA,mBAAA;EACA,UAAA;EAEA,YAAA;EACA,gBAAA;EAEA,kBAAA;EACA,yBAAA;EACA,mBAAA;AL8kBJ;AK5kBE;EACE,aAAA;EACA,sBAAA;EACA,SAAA;EACA,eAAA;AL8kBJ;AK1kBM;EACE,kBAAA;EACA,mBAAA;AL4kBR;AK1kBQ;EACE,qBAAA;EACA,WAAA;AL4kBV;AK1kBQ;EACE,uBAAA;EACA,YAAA;EACA,mBAAA;AL4kBV;AK1kBU;EACE,qBAAA;EACA,sBAAA;EACA,WAAA;EACA,YAAA;AL4kBZ;AKtkBM;EACE,aAAA;EACA,QAAA;ALwkBR;AKrkBI;EACE,kBAAA;ALukBN;AKrkBM;EACE,kBAAA;EACA,UAAA;EACA,WAAA;EACA,WAAA;EACA,SAAA;EACA,cHzDG;EG0DH,eAAA;ALukBR;AKrkBM;EACE,kBAAA;EACA,yBAAA;EACA,gBAAA;EACA,YAAA;EACA,YAAA;EACA,eAAA;EACA,sBAAA;ALukBR;;AK9jBA;EACE,WAAA;EACA,aAAA;EACA,yBAAA;ALikBF;;AK7jBA;EACE,aAAA;EACA,uBAAA;EACA,mBAAA;EACA,QAAA;ALgkBF;AK9jBE;EACE,iBAAA;ALgkBJ;;AK1jBA;EACE,yBAAA;AL6jBF;;AMnqBA;EACE,WAAA;EACA,UAAA;ANsqBF;;AMnqBA,qBAAA;AACA;EACE,mBAAA,EAAA,cAAA;ANsqBF;;AMnqBA,0BAAA;AACA;EACE,mBJLS,EIKc,cAAA;ANsqBzB;;AMnqBA,sBAAA;AACA;EACE,mBAAA,EAAA,wBAAA;ANsqBF;;AOvrBA;EACE,uBAAA;EACA,YAAA;EACA,gBAAA;EACA,gBAAA;EACA,YAAA;AP0rBF;AOxrBE;EACE,SAAA;AP0rBJ;AOtrBE;EACE,6BAAA;EACA,gCAAA;EACA,yBAAA;APwrBJ;AOtrBI;EACE,yBAAA;EACA,+BAAA;EACA,YAAA;EACA,uBAAA;APwrBN;AOtrBM;EACE,gBAAA;EACA,UAAA;APwrBR;AOjrBE;EACE,6BAAA;EACA,2BAAA;EACA,oCAAA;EACA,qCAAA;APmrBJ;AOjrBI;EACE,yBL9BK;AFitBX;AOjrBI;EACE,yBLlCK;AFqtBX;AOjrBI;EACE,yBLjCA;AFotBN;AOjrBI;EACE,yBAAA;APmrBN;AOjrBI;EACE,uBAAA;APmrBN;AOhrBI;EACE,+BAAA;APkrBN;AOtqBM;EACE,4CAAA;APwqBR;AOvqBQ;EACE,YAAA;EACA,cLnEC;EKoED,kBAAA;EACA,SAAA;EACA,WAAA;EACA,gBAAA;EACA,cAAA;APyqBV;AOlqBE;EACE,YAAA;APoqBJ;AOlqBI;EACE,YAAA;APoqBN;;AOxpBI;EACE,YAAA;EACA,mBAAA;AP2pBN;AOxpBQ;EACE,6BAAA;AP0pBV;;AO9oBI;EACE,gCAAA;EACA,gBAAA;EACA,+BAAA;APipBN;AO/oBM;EACE,yBLjHG;AFkwBX;AO1nBM;EACE,aAAA;AP4nBR;;AO/mBM;EACE,YAAA;APknBR;AO/mBM;EACE,aAAA;APinBR;AO5mBE;EACE,mBAAA;AP8mBJ;AO7mBI;EACE,gCAAA;AP+mBN;AO7mBI;EACE,mBAAA;AP+mBN;AO1mBI;EACE,uBAAA;AP4mBN;AO1mBI;EACE,wBAAA;AP4mBN;AOzmBE;EACE,gCAAA;AP2mBJ;;AOrmBA,UAAA;AAEA;EACE,yBAAA;APumBF;;AOrmBA;EACE,gBAAA;APwmBF;;AOrmBA;EACE,yBAAA;EACA,gBAAA;EACA,cAAA;APwmBF;;AOtmBA;EACE,eAAA;EACA,yBAAA;EACA,gCAAA;EACA,6BAAA;APymBF;AOvmBE;EACE,kBAAA;EACA,yBAAA;EAEA,gBAAA;EACA,WAAA;EACA,YAAA;EACA,gBAAA;EAEA,UAAA;EACA,SAAA;EAEA,6BAAA;EACA,gCAAA;APsmBJ;AOpmBI;EACE,8BAAA;APsmBN;AOlmBE;EACE,mBAAA;EACA,kBAAA;EACA,gCAAA;EACA,YAAA;APomBJ;AOlmBI;EACE,8BAAA;APomBN;AOlmBI;EACE,+BAAA;APomBN;AOhmBE;EACE,gBAAA;EACA,MAAA;EACA,OAAA;APkmBJ;;AO/lBA;EACE,aAAA;EACA,kBAAA;APkmBF;AOhmBE;EACE,gBAAA;EACA,OAAA;EACA,MAAA;APkmBJ;AO/lBE;EACE,eAAA;APimBJ;;AOxlBM;EACE,YAAA;AP2lBR;AOzlBM;EACE,YAAA;AP2lBR;AOzlBM;EACE,YAAA;AP2lBR;AOzlBM;EACE,YAAA;AP2lBR;AOzlBM;EACE,YAAA;AP2lBR;AOzlBM;EACE,YAAA;AP2lBR;AOzlBM;EACE,aAAA;AP2lBR;;AOhlBE;EACE,kBAAA;APmlBJ;AOllBI;EACE,gBAAA;EACA,MAAA;EACA,OAAA;EACA,+BAAA;APolBN;AOllBM;EACE,aAAA;EACA,gBAAA;APolBR;AOzkBM;EACE,aAAA;AP2kBR;;AOvjBQ;EACE,yBLpVC;EKqVD,eAAA;AP0jBV;;AQv5BA;EACE,YAAA;AR05BF;AQv5BE;EACE,WAAA;ARy5BJ;AQv5BI;EACE,kBAAA;ARy5BN;AQv5BM;EACE,kBAAA;EACA,WAAA;EACA,QAAA;EACA,eAAA;ARy5BR;AQv5BQ;EACE,gBAAA;EACA,cNRC;AFi6BX;AQp5BI;EACE,WAAA;ARs5BN;AQp5BM;EACE,wBAAA;EAAA,mBAAA;EACA,iBAAA;EACA,kBAAA;EACA,aAAA;EACA,mBAAA;EACA,WAAA;EACA,sBAAA;ARs5BR;AQj5BU;EACE,mBAAA;EACA,yBAAA;EACA,cNxCD;EMyCC,gBAAA;EACA,gBAAA;EAEA,uBAAA;EACA,YAAA;EACA,kBAAA;ARk5BZ;AQh5BY;EACE,yBNjDH;EMkDG,YAAA;ARk5Bd;AQv3BQ;EACE,iBAAA;EACA,YAAA;EACA,UAAA;ARy3BV;AQv3BQ;EACE,iBAAA;EACA,YAAA;EACA,UAAA;EACA,gBAAA;ARy3BV;AQv3BU;EACE,WAAA;ARy3BZ;AQv3BY;EACE,WAAA;ARy3Bd;AQv3Bc;EACE,aAAA;EACA,YAAA;ARy3BhB;AQt3Bc;EACE,kBAAA;ARw3BhB;AQr3BY;EACE,WAAA;EACA,yBAAA;ARu3Bd;AQr3Bc;EACE,WAAA;ARu3BhB;AQr3Bc;EACE,WAAA;ARu3BhB;AQp3BgB;EACE,YAAA;EACA,sBAAA;ARs3BlB;AQz2Bc;EACE,UAAA;AR22BhB;AQz2BgB;EACE,WAAA;EACA,gBAAA;AR22BlB;AQv2Bc;EACE,SAAA;ARy2BhB;AQp2BU;EACE,uBAAA;ARs2BZ;AQp2BU;EACE,sBAAA;ARs2BZ;AQp2BU;EACE,qCAAA;ARs2BZ;AQp2BU;EACE,yBAAA;ARs2BZ;AQ71BE;EACE,YAAA;EACA,aAAA;AR+1BJ;AQ31BE;EACE,YAAA;EACA,iBAAA;EACA,YAAA;AR61BJ;AQ11BE;EACE,iBAAA;EACA,eAAA;AR41BJ;AQz1BE;EACE,sBAAA;EACA,gBAAA;AR21BJ;AQz1BI;EACE,cAAA;EACA,mBAAA;EACA,YAAA;EACA,iBAAA;AR21BN;AQz1BM;EACE,wBAAA;EACA,wBAAA;EACA,mBAAA;EACA,eAAA;AR21BR;AQz1BQ;EACE,WAAA;EACA,wBAAA;EACA,mBAAA;EACA,mBAAA;AR21BV;AQz1BU;EACE,qBAAA;EACA,YAAA;EACA,mBAAA;EACA,SAAA;EACA,eAAA;AR21BZ;AQz1BU;EACE,WAAA;EACA,cAAA;EACA,kBAAA;AR21BZ;AQx1BU;EACE,iBAAA;AR01BZ;AQv1BU;EACE,oBAAA;EACA,YAAA;EACA,mBAAA;ARy1BZ;AQv1BY;EACE,WAAA;ARy1Bd;AQr1BU;EACE,yBAAA;EACA,sBAAA;EACA,YAAA;EACA,yBAAA;EACA,gBAAA;EACA,iBAAA;ARu1BZ;AQr1BY;EACE,uBAAA;ARu1Bd;AQn1BU;EACE,kCAAA;EACA,kBAAA;EACA,qBAAA;ARq1BZ;AQ/0BI;EACE,mBAAA;EACA,YAAA;EACA,OAAA;ARi1BN;AQ/0BM;EACE,WAAA;EACA,uBAAA;EACA,iBAAA;EACA,aAAA;EACA,mBAAA;EACA,uBAAA;EACA,kBAAA;EACA,uBAAA;ARi1BR;AQ/0BQ;EACE,aAAA;EACA,kBAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,YAAA;EACA,sCAAA;EACA,uBAAA;EACA,mBAAA;ARi1BV;AQ/0BU;EACE,UAAA;EACA,WAAA;EACA,kBAAA;EACA,gBAAA;ARi1BZ;AQ70BQ;EACE,aAAA;AR+0BV;AQ30BM;EACE,WAAA;EACA,WAAA;EACA,sBAAA;EACA,aAAA;EACA,uBAAA;EACA,mBAAA;EACA,gBAAA;AR60BR;AQ30BQ;EACE,aAAA;AR60BV;AQv0BE;EACE,UAAA;ARy0BJ;AQt0BE;EACE,WAAA;EACA,kBAAA;EACA,yBAAA;EACA,yBAAA;EACA,YAAA;ARw0BJ;AQt0BI;EACE,iBAAA;EACA,oCAAA;EACA,cAAA;ARw0BN;;ASzoCA;EACE,aAAA;EACA,mBAAA;EACA,uBAAA;EACA,eAAA;EACA,MAAA;EACA,SAAA;EACA,OAAA;EACA,QAAA;EACA,8BAAA;EACA,WAAA;AT4oCF;AS1oCE;EACE,gBAAA;EACA,+CAAA;EACA,kBAAA;EACA,eAAA;EAEA,2BAAA;EAAA,sBAAA;EAKA,aAAA;EACA,kBAAA;EACA,sBAAA;ATuoCJ;ASroCI;EACE,YAAA;ATuoCN;ASnoCQ;EACE,YAAA;ATqoCV;ASnoCQ;EACE,eAAA;EACA,wBAAA;ATqoCV;AShoCI;EACE,aAAA;EACA,gBAAA;EAGA,gBAAA;ATgoCN;AS/nCM;EACE,YAAA;ATioCR;AS3nCM;EACE,eAAA;EACA,mBAAA;AT6nCR;AS3nCQ;EACE,eAAA;AT6nCV;AStnCQ;EACE,kBAAA;EACA,cAAA;ATwnCV;ASrnCQ;EACE,aAAA;EACA,yBAAA;EACA,QAAA;EACA,mBAAA;EACA,YAAA;EACA,mBAAA;ATunCV;ASrnCU;EACE,sBAAA;EACA,YAAA;EACA,eAAA;EACA,kBAAA;EACA,yBAAA;ATunCZ;AShnCM;EACE,8BAAA;ATknCR;AShnCM;EACE,iBAAA;EACA,YAAA;EACA,eAAA;EACA,cAAA;ATknCR;AShnCQ;EACE,WAAA;ATknCV;AS/mCM;EACE,sBAAA;EACA,cAAA;ATinCR;AS/mCQ;EACE,wBAAA;EAAA,mBAAA;EACA,iBAAA;ATinCV;;AS1mCA;EACE,YAAA;AT6mCF;;AUpuCA;EACE,aAAA;EACA,uBAAA;EACA,mBAAA;EACA,aAAA;AVuuCF;;AUpuCA;EACE,aAAA;EACA,SAAA;AVuuCF;;AUluCA;EACE,kEAAA;EACA,iBAAA;EACA,gBAAA;EACA,YAAA;EACA,WAAA;EACA,mBAAA;EACA,kBAAA;EACA,2BAAA;EACA,sBAAA;AVquCF;;AUjuCA;EACE,aAAA;EACA,sBAAA;EACA,uBAAA;EACA,SAAA;AVouCF;;AUjuCA;EACE,cR9BS;EQ+BT,0BAAA;EACA,eAAA;EACA,gBAAA;EACA,SAAA;AVouCF;;AUjuCA;EACE,aAAA;EACA,sBAAA;EACA,SAAA;EACA,gBAAA;EACA,WAAA;EACA,wBAAA;EAAA,mBAAA;AVouCF;AUjuCI;EACE,yBAAA;AVmuCN;;AU9tCA;EACE,gBAAA;EACA,eAAA;EACA,YAAA;EACA,0BAAA;AViuCF;;AU9tCA;EACE,cAAA;AViuCF;;AU9tCA;EACE,wBAAA;EACA,YAAA;EACA,oCAAA;EACA,kBAAA;EACA,eAAA;AViuCF;;AU7tCA;EACE,aAAA;EACA,QAAA;AVguCF;;AU7tCA;EACE,WAAA;EACA,YAAA;EACA,SAAA;EACA,UAAA;AVguCF;;AU7tCA;EACE,WAAA;AVguCF;;AU9tCA;EACE,WAAA;EACA,YAAA;EACA,0BAAA;EACA,gBAAA;EACA,eAAA;AViuCF;;AWl0CA;EACE,8CAAA;EACA,4BAAA;EACA,2BAAA;EACA,sBAAA;AXq0CF","file":"style.css"} \ No newline at end of file diff --git a/home_dir/www/ksvc/inc/js/vars.js.php b/home_dir/www/ksvc/inc/js/vars.js.php index ef33472..56ecfda 100644 --- a/home_dir/www/ksvc/inc/js/vars.js.php +++ b/home_dir/www/ksvc/inc/js/vars.js.php @@ -42,5 +42,6 @@ const varsTLColor = ; const varsIO_TYPE_FIN = ; const varsNCR_CD = ; const varsTASK_TYPE = ; -const varsSTOP_CD = ; -const varsDEF_CD = ; \ No newline at end of file +const varsSTOP_CD = ; +const varsDEF_CD = ; +const varsRSLT_GRP = ; \ No newline at end of file diff --git a/home_dir/www/ksvc/prod/cnt_ct_worker/cnt_ct_worker.ajax.php b/home_dir/www/ksvc/prod/cnt_ct_worker/cnt_ct_worker.ajax.php index c16bcdf..32217c6 100644 --- a/home_dir/www/ksvc/prod/cnt_ct_worker/cnt_ct_worker.ajax.php +++ b/home_dir/www/ksvc/prod/cnt_ct_worker/cnt_ct_worker.ajax.php @@ -1,5 +1,11 @@ $_REQUEST["EMP_NO"] ?: "", "P_EMP_NM" => $_REQUEST["EMP_NM"] ?: "", - "P_START_DATE" => $_REQUEST["date_st"], - "P_ED_DATE" => $_REQUEST["date_ed"], + "P_ST_DATE" => $_REQUEST["date_st"], + "P_ED_DATE" => $_REQUEST["date_ed"], ); $rst = $baseObj->DB->exec($squl, $params); diff --git a/home_dir/www/ksvc/prod/cnt_ct_worker/cnt_ct_worker.js b/home_dir/www/ksvc/prod/cnt_ct_worker/cnt_ct_worker.js index ca56707..82aa00a 100644 --- a/home_dir/www/ksvc/prod/cnt_ct_worker/cnt_ct_worker.js +++ b/home_dir/www/ksvc/prod/cnt_ct_worker/cnt_ct_worker.js @@ -32,7 +32,6 @@ class Tb_main_class { } } data.mode = mode - console.log(data) // let USEFLAG = document.getElementById("USE_FLG").checked?"Y":"N"; //사용여부 ajax_json({ url: this.ajaxUrl, @@ -43,10 +42,11 @@ class Tb_main_class { let originData = data.data; originData = originData.map(el=>{ // 대기시간!!!!!!!! 변경할것 - el[`REAL_RUN_TM_${el['WRK_DT']}`] = el['REAL_RUN_TM'] + el[`REAL_RUN_TM_${el['WORK_DT']}`] = el['REAL_RUN_TM'] return el; }); - + console.log(data.data); + console.log(originData); originData = originData.reduce((acc, curr)=>{ const key = curr.EMP_NO + curr.WRK_TEAM; diff --git a/home_dir/www/ksvc/prod/cnt_defect_order/cnt_defect_order.ajax.php b/home_dir/www/ksvc/prod/cnt_defect_order/cnt_defect_order.ajax.php index 95c700b..f70d33a 100644 --- a/home_dir/www/ksvc/prod/cnt_defect_order/cnt_defect_order.ajax.php +++ b/home_dir/www/ksvc/prod/cnt_defect_order/cnt_defect_order.ajax.php @@ -13,11 +13,11 @@ if (!_notAuth("R")) { case 'getDefOrderList': - $squl = "USP_P_DEF_RSLT_S10"; + $squl = "USP_P_CNT_DEF_WO_S10"; $params = array( "P_ITEM_GRP" => $_REQUEST["ITEM_GRP"] ?: "", - "P_START_DATE" => $_REQUEST["date_st"], + "P_ST_DATE" => $_REQUEST["date_st"], "P_ED_DATE" => $_REQUEST["date_ed"], ); $rst = $baseObj->DB->exec($squl, $params); diff --git a/home_dir/www/ksvc/prod/cnt_defect_order/cnt_defect_order.js b/home_dir/www/ksvc/prod/cnt_defect_order/cnt_defect_order.js index e4eb65e..12569cf 100644 --- a/home_dir/www/ksvc/prod/cnt_defect_order/cnt_defect_order.js +++ b/home_dir/www/ksvc/prod/cnt_defect_order/cnt_defect_order.js @@ -48,7 +48,7 @@ class Tb_main_class { }); originData = originData.reduce((acc, curr)=>{ - const key = curr.WO_NO; + const key = curr.WO_NO ; if(!acc[key]){ acc[key] = {...curr}; @@ -197,7 +197,7 @@ setFilter() { // formatterParams: { checkval: "Y" }, // }, { formatter: "rownum", title: "NO", width: 50 }, - { field: "WO_NO", title: "오더번호", width: 100 }, + { field: "WO_NO", title: "오더번호", width: 100 ,visible : false}, { field: "ITEM_CD", title: "품목", width: 100,}, { field: "ITEM_GRP", title: "품목그룹", width: 100,}, ...this.getDate() diff --git a/home_dir/www/ksvc/prod/cnt_defect_worker/cnt_defect_worker.ajax.php b/home_dir/www/ksvc/prod/cnt_defect_worker/cnt_defect_worker.ajax.php index ced75a9..3d0f162 100644 --- a/home_dir/www/ksvc/prod/cnt_defect_worker/cnt_defect_worker.ajax.php +++ b/home_dir/www/ksvc/prod/cnt_defect_worker/cnt_defect_worker.ajax.php @@ -15,7 +15,7 @@ if(!_notAuth("R")) { // 생산오더 리스트 조회 case 'getDefectWorker': - $sql = "USP_P_WO_DEF_RSLT_S20"; + $sql = "USP_P_CNT_DEF_EMP_S10"; $params = array( "WRK_EMP_NO" => $_REQUEST['worker_pop'] ?: "", "WRK_EMP_NM" => $_REQUEST['sub_worker_pop'] ?: "", diff --git a/home_dir/www/ksvc/prod/cnt_defect_worker/cnt_defect_worker.js b/home_dir/www/ksvc/prod/cnt_defect_worker/cnt_defect_worker.js index 29e4c62..8eacfef 100644 --- a/home_dir/www/ksvc/prod/cnt_defect_worker/cnt_defect_worker.js +++ b/home_dir/www/ksvc/prod/cnt_defect_worker/cnt_defect_worker.js @@ -198,7 +198,7 @@ class Tb_main_class { // }, // { formatter: "rownum", title: "NO", width: 50 }, { field: "WRK_TEAM", title: "소속", width: 100 }, - { field: "EMP_NO", title: "성명", width: 100,}, + { field: "EMP_NM", title: "성명", width: 100,}, ...this.getDate() ]; const commonFieldData = { diff --git a/home_dir/www/ksvc/prod/cnt_oper_wt/cnt_oper_wt.ajax.php b/home_dir/www/ksvc/prod/cnt_oper_wt/cnt_oper_wt.ajax.php index b54fa12..e859fd4 100644 --- a/home_dir/www/ksvc/prod/cnt_oper_wt/cnt_oper_wt.ajax.php +++ b/home_dir/www/ksvc/prod/cnt_oper_wt/cnt_oper_wt.ajax.php @@ -13,7 +13,7 @@ if (!_notAuth("R")) { case 'getOperWtList': - $squl = "USP_P_WO_OPER_S20"; + $squl = "USP_P_CNT_OPER_WT_S10"; $params = array( "P_OP_CD" => $_REQUEST["OP_CD"] ?: "", diff --git a/home_dir/www/ksvc/prod/cnt_prod_faclt/cnt_prod_faclt.ajax.php b/home_dir/www/ksvc/prod/cnt_prod_faclt/cnt_prod_faclt.ajax.php index d9c0cae..7cd3d83 100644 --- a/home_dir/www/ksvc/prod/cnt_prod_faclt/cnt_prod_faclt.ajax.php +++ b/home_dir/www/ksvc/prod/cnt_prod_faclt/cnt_prod_faclt.ajax.php @@ -13,7 +13,7 @@ if (!_notAuth("R")) { case 'getFacltOperList': - $squl = "USP_P_FACLT_OPER_S30"; + $squl = "USP_P_CNT_PROD_FACLT_S10"; $params = array( "P_ST_DATE" => $_REQUEST["date_st"], diff --git a/home_dir/www/ksvc/prod/cnt_prod_faclt/cnt_prod_faclt.php b/home_dir/www/ksvc/prod/cnt_prod_faclt/cnt_prod_faclt.php index b1d2cd9..fdb0ed2 100644 --- a/home_dir/www/ksvc/prod/cnt_prod_faclt/cnt_prod_faclt.php +++ b/home_dir/www/ksvc/prod/cnt_prod_faclt/cnt_prod_faclt.php @@ -63,7 +63,7 @@ include_once _SVC_INC_PATH_ . "/header.php"; - +
diff --git a/home_dir/www/ksvc/prod/cnt_prod_worker/cnt_prod_worker.ajax.php b/home_dir/www/ksvc/prod/cnt_prod_worker/cnt_prod_worker.ajax.php index 6972ecf..7e3fea0 100644 --- a/home_dir/www/ksvc/prod/cnt_prod_worker/cnt_prod_worker.ajax.php +++ b/home_dir/www/ksvc/prod/cnt_prod_worker/cnt_prod_worker.ajax.php @@ -19,12 +19,11 @@ if (!_notAuth("R")) { case 'getProdList': - $squl = "USP_P_PRD_AMT_S10"; + $squl = "USP_P_CNT_PROD_WORKER_S10"; $params = array( -// "P_ITEM_GRP" => $_REQUEST["ITEM_GRP"] ?: "", - "P_START_DATE" => $_REQUEST["date_st"], - "P_ED_DATE" => $_REQUEST["date_ed"], + "P_ST_DATE" => $_REQUEST["date_st"], + "P_ED_DATE" => $_REQUEST["date_ed"], ); $rst = $baseObj->DB->exec($squl, $params); diff --git a/home_dir/www/ksvc/prod/cnt_prod_worker/cnt_prod_worker.php b/home_dir/www/ksvc/prod/cnt_prod_worker/cnt_prod_worker.php index e24f26d..a22258b 100644 --- a/home_dir/www/ksvc/prod/cnt_prod_worker/cnt_prod_worker.php +++ b/home_dir/www/ksvc/prod/cnt_prod_worker/cnt_prod_worker.php @@ -63,7 +63,7 @@ include_once _SVC_INC_PATH_ . "/header.php"; - + diff --git a/home_dir/www/ksvc/prod/reg_order/reg_order.ajax.php b/home_dir/www/ksvc/prod/reg_order/reg_order.ajax.php index c1e4d52..5efdbec 100644 --- a/home_dir/www/ksvc/prod/reg_order/reg_order.ajax.php +++ b/home_dir/www/ksvc/prod/reg_order/reg_order.ajax.php @@ -256,7 +256,8 @@ if(!_notAuth("R")) { "ORD_QTY" => $data['ORD_QTY'], // "ORD_DT" => $data['ORD_DT']?:date("Y-m-d", time()), // "ORD_DT" => date("Y-m-d", time()), - "ORD_TYPE" => $data['WRK_QTY']?:"", + "WRK_QTY" => $data['WRK_QTY']?:"", + "WO_OP_AMT" => $data['WO_OP_AMT']?:"", "ORD_STATUS" => $data['PLANT_CD']?:"", // "DLVY_REQ_DT" => date("Y-m-d", time()), // "DLVY_REQ_DT" => $data['DLVY_REQ_DT']?:date("Y-m-d", time()), diff --git a/home_dir/www/ksvc/prod/reg_order/reg_order.js b/home_dir/www/ksvc/prod/reg_order/reg_order.js index 9f632cb..e74a8bd 100644 --- a/home_dir/www/ksvc/prod/reg_order/reg_order.js +++ b/home_dir/www/ksvc/prod/reg_order/reg_order.js @@ -443,7 +443,10 @@ class Tb_process_class { for(let temp in data.data){ this.lastNum += 10; - this.tbList.addRow({ OP_CD : makingData[temp].OP_CD,OP_SEQ : makingData[temp].OP_SEQ ,WO_NO : Tb_order.tbList.getSelectedData()[0].WO_NO, _STATUS_: "I" }); + this.tbList.addRow({ OP_CD : makingData[temp].OP_CD, + OP_SEQ : makingData[temp].OP_SEQ , + WO_OP_AMT : makingData[temp].WO_OP_AMT, + WO_NO : Tb_order.tbList.getSelectedData()[0].WO_NO, _STATUS_: "I" }); } } @@ -658,13 +661,14 @@ class Tb_process_class { }, {formatter:"rownum", title:"NO", width:50}, {field:"OP_SEQ", title:"공순", width:100}, - {field:"OP_CD", title:"공정", width:100,editor: "input"}, - {field:"ORD_QTY", title:"지시 수량", width:80 ,editor: "input", + {field:"OP_CD", title:"공정명", width:100,editor: "input"}, + {field:"WO_OP_AMT", title:"공정 단가", width:80 ,editor: "input", formatter: "money", formatterParams: { decimal:".", precision:0 - } + }, + hozAlign: "right" }, // {field:"", title:"준비시간
(분)", width:100}, // {field:"", title:"가공시간
(분)", width:100}, diff --git a/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.js b/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.js index d7af035..3f6ee90 100644 --- a/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.js +++ b/home_dir/www/ksvc/prod/reg_order_result/reg_order_result.js @@ -346,8 +346,10 @@ class Tb_order_class { * @Parameter 없음 */ init() { + + // field 정의 - const fields = [ + fields = [ // 생산오더, 품목, 도면번호, 거래처, 납기일, 지시일, 지시구분, 지시 수량, 단위, 상태, 작업순서, 비고 { field:"check", title: "선택", width: 50, headerSort: false,formatter: tb_common_funtions.formatterCheckboxIcon,formatterParams: { checkval: "Y" },}, { formatter: "rownum", title: "NO", width: 50 }, diff --git a/home_dir/www/ksvc/prod/reg_plan/reg_plan.js b/home_dir/www/ksvc/prod/reg_plan/reg_plan.js index 4090e62..b4027a1 100644 --- a/home_dir/www/ksvc/prod/reg_plan/reg_plan.js +++ b/home_dir/www/ksvc/prod/reg_plan/reg_plan.js @@ -4,9 +4,10 @@ class Tb_main_class { constructor(container) { + let _this = this; this.ajaxUrl = "./reg_plan.ajax.php"; this.tbList = ""; - this.lastGroupId = 1; + _this.lastGroupId = 0; this.container = document.querySelector(container); this.table = this.container.querySelector(".hy-table"); // this.upBtn = this.container.querySelector(".up-btn") || ""; @@ -16,14 +17,14 @@ class Tb_main_class { } - - - - - + /* + * @Overview 생산계획등록 + * @Parameter DATABASE로부터 받은 데이터 + * @function DB 데이터 가공하여 바인딩. + */ manageData(data) { // console.log(data); - + let _this = this; let arr = new Array(); const result = Object.groupBy(data.data, ({ SEQ_NO }) => SEQ_NO) @@ -43,6 +44,7 @@ class Tb_main_class { tempITEM[`AM_PLAN_QTY_${date}`] = rst.AMITEM tempITEM[`PM_PLAN_QTY_${date}`] = rst.PMITEM tempITEM[`NI_PLAN_QTY_${date}`] = rst.NIITEM + _this.lastGroupId = parseInt(rst.SEQ_NO); return tempITEM; }) @@ -52,11 +54,12 @@ class Tb_main_class { let arr = new Array(); tempQTY['SEQ_NO'] = rst.SEQ_NO tempQTY['SEPER'] = "계획" - tempQTY['PLAN_FACLT_CD'] = rst.PLAN_FACLT_CD + tempQTY['PLAN_FACLT_CD'] = rst.PLAN_FACLT_CD tempQTY['WRK_TEAM'] = rst.WRK_TEAM tempQTY[`AM_PLAN_QTY_${date}`] = rst.AMQTY tempQTY[`PM_PLAN_QTY_${date}`] = rst.PMQTY tempQTY[`NI_PLAN_QTY_${date}`] = rst.NIQTY + _this.lastGroupId = parseInt(rst.SEQ_NO); return tempQTY; }) @@ -71,6 +74,7 @@ class Tb_main_class { tempPRD[`AM_PLAN_QTY_${date}`] = rst.AMPRD tempPRD[`PM_PLAN_QTY_${date}`] = rst.PMPRD tempPRD[`NI_PLAN_QTY_${date}`] = rst.NIPRD + _this.lastGroupId = parseInt(rst.SEQ_NO); return tempPRD; }) @@ -164,12 +168,15 @@ class Tb_main_class { * @Parameter 없음 */ setFilter() { + this.tbList =""; this.init(); + this.getMainList( "getPlanList", "team_pop", "product_pop", - "sub_product_pop" + "sub_product_pop", + "plan_date" ); } @@ -179,27 +186,31 @@ class Tb_main_class { * @function 기본키, _STATUS_:I 값을 넣은 행 추가 */ addRow() { + console.log("test"); + this.lastGroupId += 1; + // Tabulator 인스턴스에 데이터 추가 this.tbList.addRow({ - groupId: this.lastGroupId + 1, + SEQ_NO: this.lastGroupId, SEPER: "그룹", _STATUS_: "I", SEPER_ID: "GRP", }); + this.tbList.addRow({ - groupId: this.lastGroupId + 1, + SEQ_NO: this.lastGroupId, SEPER: "계획", _STATUS_: "I", SEPER_ID: "PLAN", }); + this.tbList.addRow({ - groupId: this.lastGroupId + 1, + SEQ_NO: this.lastGroupId, SEPER: "실적", _STATUS_: "I", SEPER_ID: "RST", }); - this.lastGroupId += 1; } /* @@ -288,9 +299,78 @@ class Tb_main_class { * @function _STATUS_ 값이 있는 데이터만 추려서 없으면 생성, 있으면 수정하기 */ putData() { + // let _this = this; + console.log(this.tbList.getData().filter((row) => row._STATUS_)); + // 저장 시 상태 변화 없는 row 요청 X + if (this.tbList.getData().filter((row) => row._STATUS_).length == 0) { + this.getMainList(); + return false; + } - // 기본키 중복 확인 및 방지 - // _STATUS_ 있는 데이터만 들고와서 PUT하기 + const blankObj = []; + const reqData = []; + + this.tbList.getRows().forEach((row) => { + // console.log(row.getData('_STATUS_')) + if (row.getData()["_STATUS_"]) { + if ( + Object.keys(row._row.data) + .filter((key) => key !== "_STATUS_" && key !== "USE_FLG") + .every((key) => { + const value = row._row.data[key]; + return value === undefined || value === ""; + }) + ) { + blankObj.push(row); + } else { + reqData.push(row.getData()); + } + } + }); + + let postdata = { + mode: "getOrderList", + reqdata: JSON.stringify( + this.tbList.getData().filter((row) => row._STATUS_) + ), + }; + if (blankObj.length !== 0) { + kuls_confirm( + "비어있는 행을 무시하고 진행하시겠습니까?", + "", + () => { + ajax_json({ + url: this.ajaxUrl, + data: postdata, + success: function (data) { + if (data.code) { + kuls_success("저장되었습니다."); + this.getMainList(); + Tb_insp_list.getMainList(); + } else { + this.tbList.getRows().forEach((row) => { + //일부 적용된 열 update 처리 + if (data.data.includes(row.getData()["PLANT_CD"])) { + row.update({ _STATUS_: "U" }); + } + }); + kuls_alert(data.mesg); + } + }, + error: function (request, status, error) { + kuls_alert(error.message); + }, + complete: function () {}, + }); + }, + () => { + blankObj.forEach((row) => { + row.getElement().classList.add("blank-row"); + }); + console.log(blankObj); + } + ); + } } /* @@ -357,17 +437,18 @@ class Tb_main_class { * @Parameter 없음 */ init() { + let fields = ""; // field 정의 - const fields = [ - { field: "id", title: "id", width: 100, visible: false }, - { field: "WRK_TEAM", title: "팀", width: 100, editor: "input" }, - { field: "PLAN_FACLT_CD", title: "설비", width: 100, editor: "input" }, - { field: "SEPER", title: "구분", width: 100 }, + fields = [ + {field: "SEQ_NO", title: "id", width: 100, visible: false}, + {field: "WRK_TEAM", title: "팀", width: 100, editor: "input"}, + {field: "PLAN_FACLT_CD", title: "설비", width: 100, editor: "input"}, + {field: "SEPER", title: "구분", width: 100}, // 날짜 필드 동적으로 넣을것 오늘부터 7일까지 ...this.getDate(), ]; - - const commonFieldData = { + let commonFieldData = ""; + commonFieldData = { headerSort: false, vertAlign: "middle", hozAlign: "center", @@ -375,7 +456,7 @@ class Tb_main_class { headerHozAlign: "center", //헤더 정렬 headerSortTristate: true, //데이터 정렬 => 정/역/초기화 }; - + this.tbList = ""; this.tbList = new Tabulator(this.table, { layout: "fitColumns", // data: [ @@ -388,7 +469,8 @@ class Tb_main_class { columnDefaults: commonFieldData, groupStartOpen: true, }); - + } +init2(){ // 데이터 불러오기 this.tbList.on("tableBuilt", () => { this.getMainList( @@ -415,7 +497,8 @@ class Tb_main_class { // 추가 ["click", "keypress"].forEach((evt) => { this.addBtn.addEventListener(evt, () => { - this.addRow(); + console.log("test"); + this.addRow && this.addRow(); }); }); // 삭제 @@ -430,6 +513,8 @@ class Tb_main_class { const filterBtn = document.querySelector("#filter_btn"); filterBtn.addEventListener(evt, () => { // setFilter 또는 setData + this.init(); + this.setFilter(); // this.getMainList("getPlanList","team_pop","product_pop","sub_product_pop"); }); @@ -445,3 +530,4 @@ class Tb_main_class { } const Tb_production_plan = new Tb_main_class("#main_table"); Tb_production_plan.init(); +Tb_production_plan.init2(); \ No newline at end of file diff --git a/home_dir/www/ksvc/prod/sts_order/sts_order.php b/home_dir/www/ksvc/prod/sts_order/sts_order.php index 7630617..81ba8aa 100644 --- a/home_dir/www/ksvc/prod/sts_order/sts_order.php +++ b/home_dir/www/ksvc/prod/sts_order/sts_order.php @@ -156,12 +156,12 @@ include_once _SVC_INC_PATH_ . "/header.php";