김예미

update menu1 & menu2 design, update menu2-payment6~9 onclick

...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 --breakpoint-md: 768px; 37 --breakpoint-md: 768px;
38 --breakpoint-lg: 992px; 38 --breakpoint-lg: 992px;
39 --breakpoint-xl: 1200px; 39 --breakpoint-xl: 1200px;
40 - --font-family-sans-serif: "Born Ready Slanted","제주고딕", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; 40 + --font-family-sans-serif: "제주고딕", "Born Ready Slanted",-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
41 --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; 41 --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
42 } 42 }
43 43
...@@ -59,7 +59,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section { ...@@ -59,7 +59,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
59 59
60 body { 60 body {
61 margin: 0; 61 margin: 0;
62 - font-family: "Born Ready Slanted","제주고딕", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; 62 + font-family: "제주고딕","Born Ready Slanted", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
63 font-size: 1rem; 63 font-size: 1rem;
64 color: #858796; 64 color: #858796;
65 text-align: left; 65 text-align: left;
...@@ -67,10 +67,13 @@ body { ...@@ -67,10 +67,13 @@ body {
67 } 67 }
68 .title{ 68 .title{
69 font-family:"Born Ready Slanted"; 69 font-family:"Born Ready Slanted";
70 - padding-bottom:20px; 70 + padding-bottom:10px;
71 padding-top:20px; 71 padding-top:20px;
72 padding-left:20px; 72 padding-left:20px;
73 } 73 }
74 +#cc{
75 + color:#000000 !important;
76 +}
74 77
75 [tabindex="-1"]:focus { 78 [tabindex="-1"]:focus {
76 outline: 0 !important; 79 outline: 0 !important;
...@@ -232,7 +235,6 @@ th { ...@@ -232,7 +235,6 @@ th {
232 235
233 label { 236 label {
234 display: inline-block; 237 display: inline-block;
235 - margin-bottom: 0.5rem;
236 } 238 }
237 239
238 button { 240 button {
...@@ -620,7 +622,7 @@ pre code { ...@@ -620,7 +622,7 @@ pre code {
620 .col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl, 622 .col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl,
621 .col-xl-auto { 623 .col-xl-auto {
622 position: relative; 624 position: relative;
623 - width: 100%; 625 + width: 750px;
624 padding-right: 0.75rem; 626 padding-right: 0.75rem;
625 padding-left: 0.75rem; 627 padding-left: 0.75rem;
626 } 628 }
...@@ -801,574 +803,6 @@ pre code { ...@@ -801,574 +803,6 @@ pre code {
801 margin-left: 91.66667%; 803 margin-left: 91.66667%;
802 } 804 }
803 805
804 -@media (min-width: 576px) {
805 - .col-sm {
806 - flex-basis: 0;
807 - flex-grow: 1;
808 - max-width: 100%;
809 - }
810 - .col-sm-auto {
811 - flex: 0 0 auto;
812 - width: auto;
813 - max-width: 100%;
814 - }
815 - .col-sm-1 {
816 - flex: 0 0 8.33333%;
817 - max-width: 8.33333%;
818 - }
819 - .col-sm-2 {
820 - flex: 0 0 16.66667%;
821 - max-width: 16.66667%;
822 - }
823 - .col-sm-3 {
824 - flex: 0 0 25%;
825 - max-width: 25%;
826 - }
827 - .col-sm-4 {
828 - flex: 0 0 33.33333%;
829 - max-width: 33.33333%;
830 - }
831 - .col-sm-5 {
832 - flex: 0 0 41.66667%;
833 - max-width: 41.66667%;
834 - }
835 - .col-sm-6 {
836 - flex: 0 0 50%;
837 - max-width: 50%;
838 - }
839 - .col-sm-7 {
840 - flex: 0 0 58.33333%;
841 - max-width: 58.33333%;
842 - }
843 - .col-sm-8 {
844 - flex: 0 0 66.66667%;
845 - max-width: 66.66667%;
846 - }
847 - .col-sm-9 {
848 - flex: 0 0 75%;
849 - max-width: 75%;
850 - }
851 - .col-sm-10 {
852 - flex: 0 0 83.33333%;
853 - max-width: 83.33333%;
854 - }
855 - .col-sm-11 {
856 - flex: 0 0 91.66667%;
857 - max-width: 91.66667%;
858 - }
859 - .col-sm-12 {
860 - flex: 0 0 100%;
861 - max-width: 100%;
862 - }
863 - .order-sm-first {
864 - order: -1;
865 - }
866 - .order-sm-last {
867 - order: 13;
868 - }
869 - .order-sm-0 {
870 - order: 0;
871 - }
872 - .order-sm-1 {
873 - order: 1;
874 - }
875 - .order-sm-2 {
876 - order: 2;
877 - }
878 - .order-sm-3 {
879 - order: 3;
880 - }
881 - .order-sm-4 {
882 - order: 4;
883 - }
884 - .order-sm-5 {
885 - order: 5;
886 - }
887 - .order-sm-6 {
888 - order: 6;
889 - }
890 - .order-sm-7 {
891 - order: 7;
892 - }
893 - .order-sm-8 {
894 - order: 8;
895 - }
896 - .order-sm-9 {
897 - order: 9;
898 - }
899 - .order-sm-10 {
900 - order: 10;
901 - }
902 - .order-sm-11 {
903 - order: 11;
904 - }
905 - .order-sm-12 {
906 - order: 12;
907 - }
908 - .offset-sm-0 {
909 - margin-left: 0;
910 - }
911 - .offset-sm-1 {
912 - margin-left: 8.33333%;
913 - }
914 - .offset-sm-2 {
915 - margin-left: 16.66667%;
916 - }
917 - .offset-sm-3 {
918 - margin-left: 25%;
919 - }
920 - .offset-sm-4 {
921 - margin-left: 33.33333%;
922 - }
923 - .offset-sm-5 {
924 - margin-left: 41.66667%;
925 - }
926 - .offset-sm-6 {
927 - margin-left: 50%;
928 - }
929 - .offset-sm-7 {
930 - margin-left: 58.33333%;
931 - }
932 - .offset-sm-8 {
933 - margin-left: 66.66667%;
934 - }
935 - .offset-sm-9 {
936 - margin-left: 75%;
937 - }
938 - .offset-sm-10 {
939 - margin-left: 83.33333%;
940 - }
941 - .offset-sm-11 {
942 - margin-left: 91.66667%;
943 - }
944 -}
945 -
946 -@media (min-width: 768px) {
947 - .col-md {
948 - flex-basis: 0;
949 - flex-grow: 1;
950 - max-width: 100%;
951 - }
952 - .col-md-auto {
953 - flex: 0 0 auto;
954 - width: auto;
955 - max-width: 100%;
956 - }
957 - .col-md-1 {
958 - flex: 0 0 8.33333%;
959 - max-width: 8.33333%;
960 - }
961 - .col-md-2 {
962 - flex: 0 0 16.66667%;
963 - max-width: 16.66667%;
964 - }
965 - .col-md-3 {
966 - flex: 0 0 25%;
967 - max-width: 25%;
968 - }
969 - .col-md-4 {
970 - flex: 0 0 33.33333%;
971 - max-width: 33.33333%;
972 - }
973 - .col-md-5 {
974 - flex: 0 0 41.66667%;
975 - max-width: 41.66667%;
976 - }
977 - .col-md-6 {
978 - flex: 0 0 100%;
979 - max-width: 100%;
980 - }
981 - .col-md-7 {
982 - flex: 0 0 58.33333%;
983 - max-width: 58.33333%;
984 - }
985 - .col-md-8 {
986 - flex: 0 0 66.66667%;
987 - max-width: 66.66667%;
988 - }
989 - .col-md-9 {
990 - flex: 0 0 75%;
991 - max-width: 75%;
992 - }
993 - .col-md-10 {
994 - flex: 0 0 83.33333%;
995 - max-width: 83.33333%;
996 - }
997 - .col-md-11 {
998 - flex: 0 0 91.66667%;
999 - max-width: 91.66667%;
1000 - }
1001 - .col-md-12 {
1002 - flex: 0 0 100%;
1003 - max-width: 100%;
1004 - }
1005 - .order-md-first {
1006 - order: -1;
1007 - }
1008 - .order-md-last {
1009 - order: 13;
1010 - }
1011 - .order-md-0 {
1012 - order: 0;
1013 - }
1014 - .order-md-1 {
1015 - order: 1;
1016 - }
1017 - .order-md-2 {
1018 - order: 2;
1019 - }
1020 - .order-md-3 {
1021 - order: 3;
1022 - }
1023 - .order-md-4 {
1024 - order: 4;
1025 - }
1026 - .order-md-5 {
1027 - order: 5;
1028 - }
1029 - .order-md-6 {
1030 - order: 6;
1031 - }
1032 - .order-md-7 {
1033 - order: 7;
1034 - }
1035 - .order-md-8 {
1036 - order: 8;
1037 - }
1038 - .order-md-9 {
1039 - order: 9;
1040 - }
1041 - .order-md-10 {
1042 - order: 10;
1043 - }
1044 - .order-md-11 {
1045 - order: 11;
1046 - }
1047 - .order-md-12 {
1048 - order: 12;
1049 - }
1050 - .offset-md-0 {
1051 - margin-left: 0;
1052 - }
1053 - .offset-md-1 {
1054 - margin-left: 8.33333%;
1055 - }
1056 - .offset-md-2 {
1057 - margin-left: 16.66667%;
1058 - }
1059 - .offset-md-3 {
1060 - margin-left: 25%;
1061 - }
1062 - .offset-md-4 {
1063 - margin-left: 33.33333%;
1064 - }
1065 - .offset-md-5 {
1066 - margin-left: 41.66667%;
1067 - }
1068 - .offset-md-6 {
1069 - margin-left: 50%;
1070 - }
1071 - .offset-md-7 {
1072 - margin-left: 58.33333%;
1073 - }
1074 - .offset-md-8 {
1075 - margin-left: 66.66667%;
1076 - }
1077 - .offset-md-9 {
1078 - margin-left: 75%;
1079 - }
1080 - .offset-md-10 {
1081 - margin-left: 83.33333%;
1082 - }
1083 - .offset-md-11 {
1084 - margin-left: 91.66667%;
1085 - }
1086 -}
1087 -
1088 -@media (min-width: 992px) {
1089 - .col-lg {
1090 - flex-basis: 0;
1091 - flex-grow: 1;
1092 - max-width: 100%;
1093 - }
1094 - .col-lg-auto {
1095 - flex: 0 0 auto;
1096 - width: auto;
1097 - max-width: 100%;
1098 - }
1099 - .col-lg-1 {
1100 - flex: 0 0 8.33333%;
1101 - max-width: 8.33333%;
1102 - }
1103 - .col-lg-2 {
1104 - flex: 0 0 16.66667%;
1105 - max-width: 16.66667%;
1106 - }
1107 - .col-lg-3 {
1108 - flex: 0 0 25%;
1109 - max-width: 25%;
1110 - }
1111 - .col-lg-4 {
1112 - flex: 0 0 33.33333%;
1113 - max-width: 33.33333%;
1114 - }
1115 - .col-lg-5 {
1116 - flex: 0 0 41.66667%;
1117 - max-width: 41.66667%;
1118 - }
1119 - .col-lg-6 {
1120 - flex: 0 0 50%;
1121 - max-width: 50%;
1122 - }
1123 - .col-lg-7 {
1124 - flex: 0 0 100%;
1125 - max-width: 100%;
1126 - }
1127 - .col-lg-8 {
1128 - flex: 0 0 66.66667%;
1129 - max-width: 66.66667%;
1130 - }
1131 - .col-lg-9 {
1132 - flex: 0 0 75%;
1133 - max-width: 75%;
1134 - }
1135 - .col-lg-10 {
1136 - flex: 0 0 83.33333%;
1137 - max-width: 83.33333%;
1138 - }
1139 - .col-lg-11 {
1140 - flex: 0 0 91.66667%;
1141 - max-width: 91.66667%;
1142 - }
1143 - .col-lg-12 {
1144 - flex: 0 0 100%;
1145 - max-width: 100%;
1146 - }
1147 - .order-lg-first {
1148 - order: -1;
1149 - }
1150 - .order-lg-last {
1151 - order: 13;
1152 - }
1153 - .order-lg-0 {
1154 - order: 0;
1155 - }
1156 - .order-lg-1 {
1157 - order: 1;
1158 - }
1159 - .order-lg-2 {
1160 - order: 2;
1161 - }
1162 - .order-lg-3 {
1163 - order: 3;
1164 - }
1165 - .order-lg-4 {
1166 - order: 4;
1167 - }
1168 - .order-lg-5 {
1169 - order: 5;
1170 - }
1171 - .order-lg-6 {
1172 - order: 6;
1173 - }
1174 - .order-lg-7 {
1175 - order: 7;
1176 - }
1177 - .order-lg-8 {
1178 - order: 8;
1179 - }
1180 - .order-lg-9 {
1181 - order: 9;
1182 - }
1183 - .order-lg-10 {
1184 - order: 10;
1185 - }
1186 - .order-lg-11 {
1187 - order: 11;
1188 - }
1189 - .order-lg-12 {
1190 - order: 12;
1191 - }
1192 - .offset-lg-0 {
1193 - margin-left: 0;
1194 - }
1195 - .offset-lg-1 {
1196 - margin-left: 8.33333%;
1197 - }
1198 - .offset-lg-2 {
1199 - margin-left: 16.66667%;
1200 - }
1201 - .offset-lg-3 {
1202 - margin-left: 25%;
1203 - }
1204 - .offset-lg-4 {
1205 - margin-left: 33.33333%;
1206 - }
1207 - .offset-lg-5 {
1208 - margin-left: 41.66667%;
1209 - }
1210 - .offset-lg-6 {
1211 - margin-left: 50%;
1212 - }
1213 - .offset-lg-7 {
1214 - margin-left: 58.33333%;
1215 - }
1216 - .offset-lg-8 {
1217 - margin-left: 66.66667%;
1218 - }
1219 - .offset-lg-9 {
1220 - margin-left: 75%;
1221 - }
1222 - .offset-lg-10 {
1223 - margin-left: 83.33333%;
1224 - }
1225 - .offset-lg-11 {
1226 - margin-left: 91.66667%;
1227 - }
1228 -}
1229 -
1230 -@media (min-width: 1200px) {
1231 - .col-xl {
1232 - flex-basis: 0;
1233 - flex-grow: 1;
1234 - max-width: 100%;
1235 - }
1236 - .col-xl-auto {
1237 - flex: 0 0 auto;
1238 - width: auto;
1239 - max-width: 100%;
1240 - }
1241 - .col-xl-1 {
1242 - flex: 0 0 8.33333%;
1243 - max-width: 8.33333%;
1244 - }
1245 - .col-xl-2 {
1246 - flex: 0 0 16.66667%;
1247 - max-width: 16.66667%;
1248 - }
1249 - .col-xl-3 {
1250 - flex: 0 0 25%;
1251 - max-width: 25%;
1252 - }
1253 - .col-xl-4 {
1254 - flex: 0 0 33.33333%;
1255 - max-width: 33.33333%;
1256 - }
1257 - .col-xl-5 {
1258 - flex: 0 0 41.66667%;
1259 - max-width: 41.66667%;
1260 - }
1261 - .col-xl-6 {
1262 - flex: 0 0 50%;
1263 - max-width: 50%;
1264 - }
1265 - .col-xl-7 {
1266 - flex: 0 0 58.33333%;
1267 - max-width: 58.33333%;
1268 - }
1269 - .col-xl-8 {
1270 - flex: 0 0 100%;
1271 - max-width: 100%;
1272 - }
1273 - .col-xl-9 {
1274 - flex: 0 0 75%;
1275 - max-width: 75%;
1276 - }
1277 - .col-xl-10 {
1278 - flex: 0 0 83.33333%;
1279 - max-width: 83.33333%;
1280 - }
1281 - .col-xl-11 {
1282 - flex: 0 0 91.66667%;
1283 - max-width: 91.66667%;
1284 - }
1285 - .col-xl-12 {
1286 - flex: 0 0 100%;
1287 - max-width: 100%;
1288 - }
1289 - .order-xl-first {
1290 - order: -1;
1291 - }
1292 - .order-xl-last {
1293 - order: 13;
1294 - }
1295 - .order-xl-0 {
1296 - order: 0;
1297 - }
1298 - .order-xl-1 {
1299 - order: 1;
1300 - }
1301 - .order-xl-2 {
1302 - order: 2;
1303 - }
1304 - .order-xl-3 {
1305 - order: 3;
1306 - }
1307 - .order-xl-4 {
1308 - order: 4;
1309 - }
1310 - .order-xl-5 {
1311 - order: 5;
1312 - }
1313 - .order-xl-6 {
1314 - order: 6;
1315 - }
1316 - .order-xl-7 {
1317 - order: 7;
1318 - }
1319 - .order-xl-8 {
1320 - order: 8;
1321 - }
1322 - .order-xl-9 {
1323 - order: 9;
1324 - }
1325 - .order-xl-10 {
1326 - order: 10;
1327 - }
1328 - .order-xl-11 {
1329 - order: 11;
1330 - }
1331 - .order-xl-12 {
1332 - order: 12;
1333 - }
1334 - .offset-xl-0 {
1335 - margin-left: 0;
1336 - }
1337 - .offset-xl-1 {
1338 - margin-left: 8.33333%;
1339 - }
1340 - .offset-xl-2 {
1341 - margin-left: 16.66667%;
1342 - }
1343 - .offset-xl-3 {
1344 - margin-left: 25%;
1345 - }
1346 - .offset-xl-4 {
1347 - margin-left: 33.33333%;
1348 - }
1349 - .offset-xl-5 {
1350 - margin-left: 41.66667%;
1351 - }
1352 - .offset-xl-6 {
1353 - margin-left: 50%;
1354 - }
1355 - .offset-xl-7 {
1356 - margin-left: 58.33333%;
1357 - }
1358 - .offset-xl-8 {
1359 - margin-left: 66.66667%;
1360 - }
1361 - .offset-xl-9 {
1362 - margin-left: 75%;
1363 - }
1364 - .offset-xl-10 {
1365 - margin-left: 83.33333%;
1366 - }
1367 - .offset-xl-11 {
1368 - margin-left: 91.66667%;
1369 - }
1370 -}
1371 -
1372 .table { 806 .table {
1373 width: 100%; 807 width: 100%;
1374 margin-bottom: 1rem; 808 margin-bottom: 1rem;
...@@ -1653,54 +1087,6 @@ pre code { ...@@ -1653,54 +1087,6 @@ pre code {
1653 background-color: rgba(255, 255, 255, 0.075); 1087 background-color: rgba(255, 255, 255, 0.075);
1654 } 1088 }
1655 1089
1656 -@media (max-width: 575.98px) {
1657 - .table-responsive-sm {
1658 - display: block;
1659 - width: 100%;
1660 - overflow-x: auto;
1661 - -webkit-overflow-scrolling: touch;
1662 - }
1663 - .table-responsive-sm > .table-bordered {
1664 - border: 0;
1665 - }
1666 -}
1667 -
1668 -@media (max-width: 767.98px) {
1669 - .table-responsive-md {
1670 - display: block;
1671 - width: 100%;
1672 - overflow-x: auto;
1673 - -webkit-overflow-scrolling: touch;
1674 - }
1675 - .table-responsive-md > .table-bordered {
1676 - border: 0;
1677 - }
1678 -}
1679 -
1680 -@media (max-width: 991.98px) {
1681 - .table-responsive-lg {
1682 - display: block;
1683 - width: 100%;
1684 - overflow-x: auto;
1685 - -webkit-overflow-scrolling: touch;
1686 - }
1687 - .table-responsive-lg > .table-bordered {
1688 - border: 0;
1689 - }
1690 -}
1691 -
1692 -@media (max-width: 1199.98px) {
1693 - .table-responsive-xl {
1694 - display: block;
1695 - width: 100%;
1696 - overflow-x: auto;
1697 - -webkit-overflow-scrolling: touch;
1698 - }
1699 - .table-responsive-xl > .table-bordered {
1700 - border: 0;
1701 - }
1702 -}
1703 -
1704 .table-responsive { 1090 .table-responsive {
1705 display: block; 1091 display: block;
1706 width: 100%; 1092 width: 100%;
...@@ -2164,13 +1550,6 @@ textarea.form-control { ...@@ -2164,13 +1550,6 @@ textarea.form-control {
2164 width: 100%; 1550 width: 100%;
2165 } 1551 }
2166 1552
2167 -@media (min-width: 576px) {
2168 - .form-inline label {
2169 - display: flex;
2170 - align-items: center;
2171 - justify-content: center;
2172 - margin-bottom: 0;
2173 - }
2174 .form-inline .form-group { 1553 .form-inline .form-group {
2175 display: flex; 1554 display: flex;
2176 flex: 0 0 auto; 1555 flex: 0 0 auto;
...@@ -2906,64 +2285,20 @@ input[type="button"].btn-block { ...@@ -2906,64 +2285,20 @@ input[type="button"].btn-block {
2906 color: #858796; 2285 color: #858796;
2907 text-align: left; 2286 text-align: left;
2908 list-style: none; 2287 list-style: none;
2909 - background-color: #fff; 2288 + background-color: #fff;
2910 - background-clip: padding-box; 2289 + background-clip: padding-box;
2911 - border: 1px solid #e3e6f0; 2290 + border: 1px solid #e3e6f0;
2912 - border-radius: 0.35rem; 2291 + border-radius: 0.35rem;
2913 -}
2914 -
2915 -.dropdown-menu-left {
2916 - right: auto;
2917 - left: 0;
2918 -}
2919 -
2920 -.dropdown-menu-right {
2921 - right: 0;
2922 - left: auto;
2923 -}
2924 -
2925 -@media (min-width: 576px) {
2926 - .dropdown-menu-sm-left {
2927 - right: auto;
2928 - left: 0;
2929 - }
2930 - .dropdown-menu-sm-right {
2931 - right: 0;
2932 - left: auto;
2933 - }
2934 -}
2935 -
2936 -@media (min-width: 768px) {
2937 - .dropdown-menu-md-left {
2938 - right: auto;
2939 - left: 0;
2940 - }
2941 - .dropdown-menu-md-right {
2942 - right: 0;
2943 - left: auto;
2944 - }
2945 -}
2946 -
2947 -@media (min-width: 992px) {
2948 - .dropdown-menu-lg-left {
2949 - right: auto;
2950 - left: 0;
2951 - }
2952 - .dropdown-menu-lg-right {
2953 - right: 0;
2954 - left: auto;
2955 - }
2956 } 2292 }
2957 2293
2958 -@media (min-width: 1200px) { 2294 +.dropdown-menu-left {
2959 - .dropdown-menu-xl-left {
2960 right: auto; 2295 right: auto;
2961 left: 0; 2296 left: 0;
2962 - } 2297 +}
2963 - .dropdown-menu-xl-right { 2298 +
2299 +.dropdown-menu-right {
2964 right: 0; 2300 right: 0;
2965 left: auto; 2301 left: auto;
2966 - }
2967 } 2302 }
2968 2303
2969 .dropup .dropdown-menu { 2304 .dropup .dropdown-menu {
...@@ -4041,150 +3376,6 @@ input[type="button"].btn-block { ...@@ -4041,150 +3376,6 @@ input[type="button"].btn-block {
4041 background-size: 100% 100%; 3376 background-size: 100% 100%;
4042 } 3377 }
4043 3378
4044 -@media (max-width: 575.98px) {
4045 - .navbar-expand-sm > .container,
4046 - .navbar-expand-sm > .container-fluid {
4047 - padding-right: 0;
4048 - padding-left: 0;
4049 - }
4050 -}
4051 -
4052 -@media (min-width: 576px) {
4053 - .navbar-expand-sm {
4054 - flex-flow: row nowrap;
4055 - justify-content: flex-start;
4056 - }
4057 - .navbar-expand-sm .navbar-nav {
4058 - flex-direction: row;
4059 - }
4060 - .navbar-expand-sm .navbar-nav .dropdown-menu {
4061 - position: absolute;
4062 - }
4063 - .navbar-expand-sm .navbar-nav .nav-link {
4064 - padding-right: 0.5rem;
4065 - padding-left: 0.5rem;
4066 - }
4067 - .navbar-expand-sm > .container,
4068 - .navbar-expand-sm > .container-fluid {
4069 - flex-wrap: nowrap;
4070 - }
4071 - .navbar-expand-sm .navbar-collapse {
4072 - display: flex !important;
4073 - flex-basis: auto;
4074 - }
4075 - .navbar-expand-sm .navbar-toggler {
4076 - display: none;
4077 - }
4078 -}
4079 -
4080 -@media (max-width: 767.98px) {
4081 - .navbar-expand-md > .container,
4082 - .navbar-expand-md > .container-fluid {
4083 - padding-right: 0;
4084 - padding-left: 0;
4085 - }
4086 -}
4087 -
4088 -@media (min-width: 768px) {
4089 - .navbar-expand-md {
4090 - flex-flow: row nowrap;
4091 - justify-content: flex-start;
4092 - }
4093 - .navbar-expand-md .navbar-nav {
4094 - flex-direction: row;
4095 - }
4096 - .navbar-expand-md .navbar-nav .dropdown-menu {
4097 - position: absolute;
4098 - }
4099 - .navbar-expand-md .navbar-nav .nav-link {
4100 - padding-right: 0.5rem;
4101 - padding-left: 0.5rem;
4102 - }
4103 - .navbar-expand-md > .container,
4104 - .navbar-expand-md > .container-fluid {
4105 - flex-wrap: nowrap;
4106 - }
4107 - .navbar-expand-md .navbar-collapse {
4108 - display: flex !important;
4109 - flex-basis: auto;
4110 - }
4111 - .navbar-expand-md .navbar-toggler {
4112 - display: none;
4113 - }
4114 -}
4115 -
4116 -@media (max-width: 991.98px) {
4117 - .navbar-expand-lg > .container,
4118 - .navbar-expand-lg > .container-fluid {
4119 - padding-right: 0;
4120 - padding-left: 0;
4121 - }
4122 -}
4123 -
4124 -@media (min-width: 992px) {
4125 - .navbar-expand-lg {
4126 - flex-flow: row nowrap;
4127 - justify-content: flex-start;
4128 - }
4129 - .navbar-expand-lg .navbar-nav {
4130 - flex-direction: row;
4131 - }
4132 - .navbar-expand-lg .navbar-nav .dropdown-menu {
4133 - position: absolute;
4134 - }
4135 - .navbar-expand-lg .navbar-nav .nav-link {
4136 - padding-right: 0.5rem;
4137 - padding-left: 0.5rem;
4138 - }
4139 - .navbar-expand-lg > .container,
4140 - .navbar-expand-lg > .container-fluid {
4141 - flex-wrap: nowrap;
4142 - }
4143 - .navbar-expand-lg .navbar-collapse {
4144 - display: flex !important;
4145 - flex-basis: auto;
4146 - }
4147 - .navbar-expand-lg .navbar-toggler {
4148 - display: none;
4149 - }
4150 -}
4151 -
4152 -@media (max-width: 1199.98px) {
4153 - .navbar-expand-xl > .container,
4154 - .navbar-expand-xl > .container-fluid {
4155 - padding-right: 0;
4156 - padding-left: 0;
4157 - }
4158 -}
4159 -
4160 -@media (min-width: 1200px) {
4161 - .navbar-expand-xl {
4162 - flex-flow: row nowrap;
4163 - justify-content: flex-start;
4164 - }
4165 - .navbar-expand-xl .navbar-nav {
4166 - flex-direction: row;
4167 - }
4168 - .navbar-expand-xl .navbar-nav .dropdown-menu {
4169 - position: absolute;
4170 - }
4171 - .navbar-expand-xl .navbar-nav .nav-link {
4172 - padding-right: 0.5rem;
4173 - padding-left: 0.5rem;
4174 - }
4175 - .navbar-expand-xl > .container,
4176 - .navbar-expand-xl > .container-fluid {
4177 - flex-wrap: nowrap;
4178 - }
4179 - .navbar-expand-xl .navbar-collapse {
4180 - display: flex !important;
4181 - flex-basis: auto;
4182 - }
4183 - .navbar-expand-xl .navbar-toggler {
4184 - display: none;
4185 - }
4186 -}
4187 -
4188 .navbar-expand { 3379 .navbar-expand {
4189 flex-flow: row nowrap; 3380 flex-flow: row nowrap;
4190 justify-content: flex-start; 3381 justify-content: flex-start;
...@@ -4443,22 +3634,6 @@ input[type="button"].btn-block { ...@@ -4443,22 +3634,6 @@ input[type="button"].btn-block {
4443 margin-bottom: 0.75rem; 3634 margin-bottom: 0.75rem;
4444 } 3635 }
4445 3636
4446 -@media (min-width: 576px) {
4447 - .card-deck {
4448 - flex-flow: row wrap;
4449 - margin-right: -0.75rem;
4450 - margin-left: -0.75rem;
4451 - }
4452 - .card-deck .card {
4453 - display: flex;
4454 - flex: 1 0 0%;
4455 - flex-direction: column;
4456 - margin-right: 0.75rem;
4457 - margin-bottom: 0;
4458 - margin-left: 0.75rem;
4459 - }
4460 -}
4461 -
4462 .card-group { 3637 .card-group {
4463 display: flex; 3638 display: flex;
4464 flex-direction: column; 3639 flex-direction: column;
...@@ -4468,63 +3643,10 @@ input[type="button"].btn-block { ...@@ -4468,63 +3643,10 @@ input[type="button"].btn-block {
4468 margin-bottom: 0.75rem; 3643 margin-bottom: 0.75rem;
4469 } 3644 }
4470 3645
4471 -@media (min-width: 576px) {
4472 - .card-group {
4473 - flex-flow: row wrap;
4474 - }
4475 - .card-group > .card {
4476 - flex: 1 0 0%;
4477 - margin-bottom: 0;
4478 - }
4479 - .card-group > .card + .card {
4480 - margin-left: 0;
4481 - border-left: 0;
4482 - }
4483 - .card-group > .card:not(:last-child) {
4484 - border-top-right-radius: 0;
4485 - border-bottom-right-radius: 0;
4486 - }
4487 - .card-group > .card:not(:last-child) .card-img-top,
4488 - .card-group > .card:not(:last-child) .card-header {
4489 - border-top-right-radius: 0;
4490 - }
4491 - .card-group > .card:not(:last-child) .card-img-bottom,
4492 - .card-group > .card:not(:last-child) .card-footer {
4493 - border-bottom-right-radius: 0;
4494 - }
4495 - .card-group > .card:not(:first-child) {
4496 - border-top-left-radius: 0;
4497 - border-bottom-left-radius: 0;
4498 - }
4499 - .card-group > .card:not(:first-child) .card-img-top,
4500 - .card-group > .card:not(:first-child) .card-header {
4501 - border-top-left-radius: 0;
4502 - }
4503 - .card-group > .card:not(:first-child) .card-img-bottom,
4504 - .card-group > .card:not(:first-child) .card-footer {
4505 - border-bottom-left-radius: 0;
4506 - }
4507 -}
4508 -
4509 .card-columns .card { 3646 .card-columns .card {
4510 margin-bottom: 0.75rem; 3647 margin-bottom: 0.75rem;
4511 } 3648 }
4512 3649
4513 -@media (min-width: 576px) {
4514 - .card-columns {
4515 - -moz-column-count: 3;
4516 - column-count: 3;
4517 - -moz-column-gap: 1.25rem;
4518 - column-gap: 1.25rem;
4519 - orphans: 1;
4520 - widows: 1;
4521 - }
4522 - .card-columns .card {
4523 - display: inline-block;
4524 - width: 100%;
4525 - }
4526 -}
4527 -
4528 .accordion > .card { 3650 .accordion > .card {
4529 overflow: hidden; 3651 overflow: hidden;
4530 } 3652 }
...@@ -4841,12 +3963,6 @@ a.badge-dark:focus, a.badge-dark.focus { ...@@ -4841,12 +3963,6 @@ a.badge-dark:focus, a.badge-dark.focus {
4841 border-radius: 0.3rem; 3963 border-radius: 0.3rem;
4842 } 3964 }
4843 3965
4844 -@media (min-width: 576px) {
4845 - .jumbotron {
4846 - padding: 4rem 2rem;
4847 - }
4848 -}
4849 -
4850 .jumbotron-fluid { 3966 .jumbotron-fluid {
4851 padding-right: 0; 3967 padding-right: 0;
4852 padding-left: 0; 3968 padding-left: 0;
...@@ -5143,90 +4259,6 @@ a.badge-dark:focus, a.badge-dark.focus { ...@@ -5143,90 +4259,6 @@ a.badge-dark:focus, a.badge-dark.focus {
5143 border-bottom-left-radius: 0; 4259 border-bottom-left-radius: 0;
5144 } 4260 }
5145 4261
5146 -@media (min-width: 576px) {
5147 - .list-group-horizontal-sm {
5148 - flex-direction: row;
5149 - }
5150 - .list-group-horizontal-sm .list-group-item {
5151 - margin-right: -1px;
5152 - margin-bottom: 0;
5153 - }
5154 - .list-group-horizontal-sm .list-group-item:first-child {
5155 - border-top-left-radius: 0.35rem;
5156 - border-bottom-left-radius: 0.35rem;
5157 - border-top-right-radius: 0;
5158 - }
5159 - .list-group-horizontal-sm .list-group-item:last-child {
5160 - margin-right: 0;
5161 - border-top-right-radius: 0.35rem;
5162 - border-bottom-right-radius: 0.35rem;
5163 - border-bottom-left-radius: 0;
5164 - }
5165 -}
5166 -
5167 -@media (min-width: 768px) {
5168 - .list-group-horizontal-md {
5169 - flex-direction: row;
5170 - }
5171 - .list-group-horizontal-md .list-group-item {
5172 - margin-right: -1px;
5173 - margin-bottom: 0;
5174 - }
5175 - .list-group-horizontal-md .list-group-item:first-child {
5176 - border-top-left-radius: 0.35rem;
5177 - border-bottom-left-radius: 0.35rem;
5178 - border-top-right-radius: 0;
5179 - }
5180 - .list-group-horizontal-md .list-group-item:last-child {
5181 - margin-right: 0;
5182 - border-top-right-radius: 0.35rem;
5183 - border-bottom-right-radius: 0.35rem;
5184 - border-bottom-left-radius: 0;
5185 - }
5186 -}
5187 -
5188 -@media (min-width: 992px) {
5189 - .list-group-horizontal-lg {
5190 - flex-direction: row;
5191 - }
5192 - .list-group-horizontal-lg .list-group-item {
5193 - margin-right: -1px;
5194 - margin-bottom: 0;
5195 - }
5196 - .list-group-horizontal-lg .list-group-item:first-child {
5197 - border-top-left-radius: 0.35rem;
5198 - border-bottom-left-radius: 0.35rem;
5199 - border-top-right-radius: 0;
5200 - }
5201 - .list-group-horizontal-lg .list-group-item:last-child {
5202 - margin-right: 0;
5203 - border-top-right-radius: 0.35rem;
5204 - border-bottom-right-radius: 0.35rem;
5205 - border-bottom-left-radius: 0;
5206 - }
5207 -}
5208 -
5209 -@media (min-width: 1200px) {
5210 - .list-group-horizontal-xl {
5211 - flex-direction: row;
5212 - }
5213 - .list-group-horizontal-xl .list-group-item {
5214 - margin-right: -1px;
5215 - margin-bottom: 0;
5216 - }
5217 - .list-group-horizontal-xl .list-group-item:first-child {
5218 - border-top-left-radius: 0.35rem;
5219 - border-bottom-left-radius: 0.35rem;
5220 - border-top-right-radius: 0;
5221 - }
5222 - .list-group-horizontal-xl .list-group-item:last-child {
5223 - margin-right: 0;
5224 - border-top-right-radius: 0.35rem;
5225 - border-bottom-right-radius: 0.35rem;
5226 - border-bottom-left-radius: 0;
5227 - }
5228 -}
5229 -
5230 .list-group-flush .list-group-item { 4262 .list-group-flush .list-group-item {
5231 border-right: 0; 4263 border-right: 0;
5232 border-left: 0; 4264 border-left: 0;
...@@ -5622,41 +4654,6 @@ a.close.disabled { ...@@ -5622,41 +4654,6 @@ a.close.disabled {
5622 overflow: scroll; 4654 overflow: scroll;
5623 } 4655 }
5624 4656
5625 -@media (min-width: 576px) {
5626 - .modal-dialog {
5627 - max-width: 500px;
5628 - margin: 1.75rem auto;
5629 - }
5630 - .modal-dialog-scrollable {
5631 - max-height: calc(100% - 3.5rem);
5632 - }
5633 - .modal-dialog-scrollable .modal-content {
5634 - max-height: calc(100vh - 3.5rem);
5635 - }
5636 - .modal-dialog-centered {
5637 - min-height: calc(100% - 3.5rem);
5638 - }
5639 - .modal-dialog-centered::before {
5640 - height: calc(100vh - 3.5rem);
5641 - }
5642 - .modal-sm {
5643 - max-width: 300px;
5644 - }
5645 -}
5646 -
5647 -@media (min-width: 992px) {
5648 - .modal-lg,
5649 - .modal-xl {
5650 - max-width: 800px;
5651 - }
5652 -}
5653 -
5654 -@media (min-width: 1200px) {
5655 - .modal-xl {
5656 - max-width: 1140px;
5657 - }
5658 -}
5659 -
5660 .tooltip { 4657 .tooltip {
5661 position: absolute; 4658 position: absolute;
5662 z-index: 1070; 4659 z-index: 1070;
...@@ -9673,7 +8670,7 @@ a:focus { ...@@ -9673,7 +8670,7 @@ a:focus {
9673 8670
9674 .bg-gradient-primary { 8671 .bg-gradient-primary {
9675 background-color: #4e73df; 8672 background-color: #4e73df;
9676 - background-image: linear-gradient(180deg, #4e73df 10%, #224abe 100%); 8673 + background-image: linear-gradient(180deg, #4e73df 20%, #001B81 100%);
9677 background-size: cover; 8674 background-size: cover;
9678 } 8675 }
9679 8676
...@@ -10228,6 +9225,9 @@ a:focus { ...@@ -10228,6 +9225,9 @@ a:focus {
10228 margin: 1rem 1rem 1rem; 9225 margin: 1rem 1rem 1rem;
10229 } 9226 }
10230 9227
9228 +hr.sidebar-divider2 {
9229 + margin: 1rem 1.5rem 0.2rem;
9230 +}
10231 .sidebar .sidebar-heading { 9231 .sidebar .sidebar-heading {
10232 text-align: center; 9232 text-align: center;
10233 padding: 0 1rem; 9233 padding: 0 1rem;
...@@ -10264,7 +9264,7 @@ a:focus { ...@@ -10264,7 +9264,7 @@ a:focus {
10264 width: 100%; 9264 width: 100%;
10265 text-align: left; 9265 text-align: left;
10266 padding-top:7px; 9266 padding-top:7px;
10267 - padding-bottom:7px; 9267 + padding-bottom:2px;
10268 padding-left:1rem; 9268 padding-left:1rem;
10269 width: 14rem; 9269 width: 14rem;
10270 } 9270 }
...@@ -10359,7 +9359,7 @@ a:focus { ...@@ -10359,7 +9359,7 @@ a:focus {
10359 color: #6e707e; 9359 color: #6e707e;
10360 } 9360 }
10361 9361
10362 -.sidebar-light hr.sidebar-divider { 9362 +.sidebar-light hr.sidebar-divider hr.sidebar-divider2{
10363 border-top: 1px solid #eaecf4; 9363 border-top: 1px solid #eaecf4;
10364 } 9364 }
10365 9365
...@@ -10411,7 +9411,7 @@ a:focus { ...@@ -10411,7 +9411,7 @@ a:focus {
10411 color: #fff; 9411 color: #fff;
10412 } 9412 }
10413 9413
10414 -.sidebar-dark hr.sidebar-divider { 9414 +.sidebar-dark hr.sidebar-divider hr.sidebar-divider2{
10415 border-top: 1px solid rgba(255, 255, 255, 0.15); 9415 border-top: 1px solid rgba(255, 255, 255, 0.15);
10416 } 9416 }
10417 9417
...@@ -11007,7 +10007,7 @@ body.sidebar-toggled footer.sticky-footer { ...@@ -11007,7 +10007,7 @@ body.sidebar-toggled footer.sticky-footer {
11007 10007
11008 #dateForm{ 10008 #dateForm{
11009 display:grid; 10009 display:grid;
11010 - grid-template-columns: 130px 23px; 10010 + grid-template-columns: 80px 13px 80px 23px;
11011 margin-left:1rem; 10011 margin-left:1rem;
11012 } 10012 }
11013 #between_date_start, #between_date_end,#between_list_date_start, #between_list_date_end, #between_rank_date_start, #between_rank_date_end, #between_timeline_date_start, #between_timeline_date_end{ 10013 #between_date_start, #between_date_end,#between_list_date_start, #between_list_date_end, #between_rank_date_start, #between_rank_date_end, #between_timeline_date_start, #between_timeline_date_end{
...@@ -11040,6 +10040,7 @@ body.sidebar-toggled footer.sticky-footer { ...@@ -11040,6 +10040,7 @@ body.sidebar-toggled footer.sticky-footer {
11040 font-size:10px; 10040 font-size:10px;
11041 color:#fff; 10041 color:#fff;
11042 margin-left:1.2rem; 10042 margin-left:1.2rem;
10043 + margin-top:6px;
11043 } 10044 }
11044 ul{ 10045 ul{
11045 list-style: none; 10046 list-style: none;
...@@ -11048,16 +10049,17 @@ ul{ ...@@ -11048,16 +10049,17 @@ ul{
11048 font-size:12px; 10049 font-size:12px;
11049 } 10050 }
11050 #choice{ 10051 #choice{
11051 - width:50%; 10052 + width:750px;
11052 - margin: 0 auto; 10053 + padding-right:160px;
10054 + padding-left:160px;
10055 + padding-bottom:30px;
11053 } 10056 }
11054 #choiceul{ 10057 #choiceul{
11055 width: 100%; 10058 width: 100%;
11056 margin: 0 auto; 10059 margin: 0 auto;
11057 - padding-left:0px;
11058 - padding-bottom:10px;
11059 display:grid; 10060 display:grid;
11060 grid-template-columns: repeat(4, 1fr); 10061 grid-template-columns: repeat(4, 1fr);
10062 + grid-row-gap:6px;
11061 } 10063 }
11062 .sort, .filterlabel{ 10064 .sort, .filterlabel{
11063 width:100%; 10065 width:100%;
...@@ -11067,14 +10069,22 @@ ul{ ...@@ -11067,14 +10069,22 @@ ul{
11067 #myList{ 10069 #myList{
11068 padding-right:160px; 10070 padding-right:160px;
11069 padding-left:160px; 10071 padding-left:160px;
11070 - padding-bottom:10px; 10072 + padding-bottom:30px;
11071 display:grid; 10073 display:grid;
11072 grid-template-columns: 1fr; 10074 grid-template-columns: 1fr;
10075 + width: 750px;
11073 } 10076 }
11074 #myList_in{ 10077 #myList_in{
11075 line-height: 1em; 10078 line-height: 1em;
11076 display:grid; 10079 display:grid;
11077 grid-template-columns: repeat(5,1fr); 10080 grid-template-columns: repeat(5,1fr);
10081 + grid-row-gap:6px;
10082 +}
10083 +#myList_in2{
10084 + line-height: 1em;
10085 + display:grid;
10086 + grid-template-columns: repeat(4,1fr);
10087 + grid-row-gap:6px;
11078 } 10088 }
11079 .search{ 10089 .search{
11080 margin-bottom:10px; 10090 margin-bottom:10px;
...@@ -11100,4 +10110,13 @@ input[type="checkbox"]{ ...@@ -11100,4 +10110,13 @@ input[type="checkbox"]{
11100 float:right; 10110 float:right;
11101 margin-right:1.5px; 10111 margin-right:1.5px;
11102 margin-top: 3px; 10112 margin-top: 3px;
10113 + display:none;
10114 +}
10115 +input[type="date"]::-webkit-outer-spin-button,
10116 +input[type="date"]::-webkit-inner-spin-button {
10117 + -webkit-appearance: none;
10118 + margin: 0;
10119 +}
10120 +.menu_icon{
10121 + margin-right:5px;
11103 } 10122 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 --breakpoint-md: 768px; 37 --breakpoint-md: 768px;
38 --breakpoint-lg: 992px; 38 --breakpoint-lg: 992px;
39 --breakpoint-xl: 1200px; 39 --breakpoint-xl: 1200px;
40 - --font-family-sans-serif: "Born Ready Slanted","제주고딕", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; 40 + --font-family-sans-serif: "제주고딕", "Born Ready Slanted",-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
41 --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; 41 --font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
42 } 42 }
43 43
...@@ -59,7 +59,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section { ...@@ -59,7 +59,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
59 59
60 body { 60 body {
61 margin: 0; 61 margin: 0;
62 - font-family: "Born Ready Slanted","제주고딕", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; 62 + font-family: "제주고딕", "Born Ready Slanted",-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
63 font-size: 1rem; 63 font-size: 1rem;
64 color: #858796; 64 color: #858796;
65 text-align: left; 65 text-align: left;
...@@ -67,10 +67,13 @@ body { ...@@ -67,10 +67,13 @@ body {
67 } 67 }
68 .title{ 68 .title{
69 font-family:"Born Ready Slanted"; 69 font-family:"Born Ready Slanted";
70 - padding-bottom:20px; 70 + padding-bottom:10px;
71 padding-top:20px; 71 padding-top:20px;
72 padding-left:20px; 72 padding-left:20px;
73 } 73 }
74 +#cc{
75 + color:#000000 !important;
76 +}
74 77
75 [tabindex="-1"]:focus { 78 [tabindex="-1"]:focus {
76 outline: 0 !important; 79 outline: 0 !important;
...@@ -232,7 +235,6 @@ th { ...@@ -232,7 +235,6 @@ th {
232 235
233 label { 236 label {
234 display: inline-block; 237 display: inline-block;
235 - margin-bottom: 0.5rem;
236 } 238 }
237 239
238 button { 240 button {
...@@ -598,8 +600,8 @@ pre code { ...@@ -598,8 +600,8 @@ pre code {
598 .row { 600 .row {
599 display: flex; 601 display: flex;
600 flex-wrap: wrap; 602 flex-wrap: wrap;
601 - margin-right: 1rem; 603 + margin-right: -0.75rem;
602 - margin-left: 1rem; 604 + margin-left: -0.75rem;
603 } 605 }
604 606
605 .no-gutters { 607 .no-gutters {
...@@ -620,11 +622,10 @@ pre code { ...@@ -620,11 +622,10 @@ pre code {
620 .col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl, 622 .col-lg-auto, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl,
621 .col-xl-auto { 623 .col-xl-auto {
622 position: relative; 624 position: relative;
623 - width: 100%; 625 + width: 750px;
624 padding-right: 0.75rem; 626 padding-right: 0.75rem;
625 padding-left: 0.75rem; 627 padding-left: 0.75rem;
626 } 628 }
627 -
628 .col { 629 .col {
629 flex-basis: 0; 630 flex-basis: 0;
630 flex-grow: 1; 631 flex-grow: 1;
...@@ -801,574 +802,6 @@ pre code { ...@@ -801,574 +802,6 @@ pre code {
801 margin-left: 91.66667%; 802 margin-left: 91.66667%;
802 } 803 }
803 804
804 -@media (min-width: 576px) {
805 - .col-sm {
806 - flex-basis: 0;
807 - flex-grow: 1;
808 - max-width: 100%;
809 - }
810 - .col-sm-auto {
811 - flex: 0 0 auto;
812 - width: auto;
813 - max-width: 100%;
814 - }
815 - .col-sm-1 {
816 - flex: 0 0 8.33333%;
817 - max-width: 8.33333%;
818 - }
819 - .col-sm-2 {
820 - flex: 0 0 16.66667%;
821 - max-width: 16.66667%;
822 - }
823 - .col-sm-3 {
824 - flex: 0 0 25%;
825 - max-width: 25%;
826 - }
827 - .col-sm-4 {
828 - flex: 0 0 33.33333%;
829 - max-width: 33.33333%;
830 - }
831 - .col-sm-5 {
832 - flex: 0 0 41.66667%;
833 - max-width: 41.66667%;
834 - }
835 - .col-sm-6 {
836 - flex: 0 0 50%;
837 - max-width: 50%;
838 - }
839 - .col-sm-7 {
840 - flex: 0 0 58.33333%;
841 - max-width: 58.33333%;
842 - }
843 - .col-sm-8 {
844 - flex: 0 0 66.66667%;
845 - max-width: 66.66667%;
846 - }
847 - .col-sm-9 {
848 - flex: 0 0 75%;
849 - max-width: 75%;
850 - }
851 - .col-sm-10 {
852 - flex: 0 0 83.33333%;
853 - max-width: 83.33333%;
854 - }
855 - .col-sm-11 {
856 - flex: 0 0 91.66667%;
857 - max-width: 91.66667%;
858 - }
859 - .col-sm-12 {
860 - flex: 0 0 100%;
861 - max-width: 100%;
862 - }
863 - .order-sm-first {
864 - order: -1;
865 - }
866 - .order-sm-last {
867 - order: 13;
868 - }
869 - .order-sm-0 {
870 - order: 0;
871 - }
872 - .order-sm-1 {
873 - order: 1;
874 - }
875 - .order-sm-2 {
876 - order: 2;
877 - }
878 - .order-sm-3 {
879 - order: 3;
880 - }
881 - .order-sm-4 {
882 - order: 4;
883 - }
884 - .order-sm-5 {
885 - order: 5;
886 - }
887 - .order-sm-6 {
888 - order: 6;
889 - }
890 - .order-sm-7 {
891 - order: 7;
892 - }
893 - .order-sm-8 {
894 - order: 8;
895 - }
896 - .order-sm-9 {
897 - order: 9;
898 - }
899 - .order-sm-10 {
900 - order: 10;
901 - }
902 - .order-sm-11 {
903 - order: 11;
904 - }
905 - .order-sm-12 {
906 - order: 12;
907 - }
908 - .offset-sm-0 {
909 - margin-left: 0;
910 - }
911 - .offset-sm-1 {
912 - margin-left: 8.33333%;
913 - }
914 - .offset-sm-2 {
915 - margin-left: 16.66667%;
916 - }
917 - .offset-sm-3 {
918 - margin-left: 25%;
919 - }
920 - .offset-sm-4 {
921 - margin-left: 33.33333%;
922 - }
923 - .offset-sm-5 {
924 - margin-left: 41.66667%;
925 - }
926 - .offset-sm-6 {
927 - margin-left: 50%;
928 - }
929 - .offset-sm-7 {
930 - margin-left: 58.33333%;
931 - }
932 - .offset-sm-8 {
933 - margin-left: 66.66667%;
934 - }
935 - .offset-sm-9 {
936 - margin-left: 75%;
937 - }
938 - .offset-sm-10 {
939 - margin-left: 83.33333%;
940 - }
941 - .offset-sm-11 {
942 - margin-left: 91.66667%;
943 - }
944 -}
945 -
946 -@media (min-width: 768px) {
947 - .col-md {
948 - flex-basis: 0;
949 - flex-grow: 1;
950 - max-width: 100%;
951 - }
952 - .col-md-auto {
953 - flex: 0 0 auto;
954 - width: auto;
955 - max-width: 100%;
956 - }
957 - .col-md-1 {
958 - flex: 0 0 8.33333%;
959 - max-width: 8.33333%;
960 - }
961 - .col-md-2 {
962 - flex: 0 0 16.66667%;
963 - max-width: 16.66667%;
964 - }
965 - .col-md-3 {
966 - flex: 0 0 25%;
967 - max-width: 25%;
968 - }
969 - .col-md-4 {
970 - flex: 0 0 33.33333%;
971 - max-width: 33.33333%;
972 - }
973 - .col-md-5 {
974 - flex: 0 0 41.66667%;
975 - max-width: 41.66667%;
976 - }
977 - .col-md-6 {
978 - flex: 0 0 100%;
979 - max-width: 100%;
980 - }
981 - .col-md-7 {
982 - flex: 0 0 58.33333%;
983 - max-width: 58.33333%;
984 - }
985 - .col-md-8 {
986 - flex: 0 0 66.66667%;
987 - max-width: 66.66667%;
988 - }
989 - .col-md-9 {
990 - flex: 0 0 75%;
991 - max-width: 75%;
992 - }
993 - .col-md-10 {
994 - flex: 0 0 83.33333%;
995 - max-width: 83.33333%;
996 - }
997 - .col-md-11 {
998 - flex: 0 0 91.66667%;
999 - max-width: 91.66667%;
1000 - }
1001 - .col-md-12 {
1002 - flex: 0 0 100%;
1003 - max-width: 100%;
1004 - }
1005 - .order-md-first {
1006 - order: -1;
1007 - }
1008 - .order-md-last {
1009 - order: 13;
1010 - }
1011 - .order-md-0 {
1012 - order: 0;
1013 - }
1014 - .order-md-1 {
1015 - order: 1;
1016 - }
1017 - .order-md-2 {
1018 - order: 2;
1019 - }
1020 - .order-md-3 {
1021 - order: 3;
1022 - }
1023 - .order-md-4 {
1024 - order: 4;
1025 - }
1026 - .order-md-5 {
1027 - order: 5;
1028 - }
1029 - .order-md-6 {
1030 - order: 6;
1031 - }
1032 - .order-md-7 {
1033 - order: 7;
1034 - }
1035 - .order-md-8 {
1036 - order: 8;
1037 - }
1038 - .order-md-9 {
1039 - order: 9;
1040 - }
1041 - .order-md-10 {
1042 - order: 10;
1043 - }
1044 - .order-md-11 {
1045 - order: 11;
1046 - }
1047 - .order-md-12 {
1048 - order: 12;
1049 - }
1050 - .offset-md-0 {
1051 - margin-left: 0;
1052 - }
1053 - .offset-md-1 {
1054 - margin-left: 8.33333%;
1055 - }
1056 - .offset-md-2 {
1057 - margin-left: 16.66667%;
1058 - }
1059 - .offset-md-3 {
1060 - margin-left: 25%;
1061 - }
1062 - .offset-md-4 {
1063 - margin-left: 33.33333%;
1064 - }
1065 - .offset-md-5 {
1066 - margin-left: 41.66667%;
1067 - }
1068 - .offset-md-6 {
1069 - margin-left: 50%;
1070 - }
1071 - .offset-md-7 {
1072 - margin-left: 58.33333%;
1073 - }
1074 - .offset-md-8 {
1075 - margin-left: 66.66667%;
1076 - }
1077 - .offset-md-9 {
1078 - margin-left: 75%;
1079 - }
1080 - .offset-md-10 {
1081 - margin-left: 83.33333%;
1082 - }
1083 - .offset-md-11 {
1084 - margin-left: 91.66667%;
1085 - }
1086 -}
1087 -
1088 -@media (min-width: 992px) {
1089 - .col-lg {
1090 - flex-basis: 0;
1091 - flex-grow: 1;
1092 - max-width: 100%;
1093 - }
1094 - .col-lg-auto {
1095 - flex: 0 0 auto;
1096 - width: auto;
1097 - max-width: 100%;
1098 - }
1099 - .col-lg-1 {
1100 - flex: 0 0 8.33333%;
1101 - max-width: 8.33333%;
1102 - }
1103 - .col-lg-2 {
1104 - flex: 0 0 16.66667%;
1105 - max-width: 16.66667%;
1106 - }
1107 - .col-lg-3 {
1108 - flex: 0 0 25%;
1109 - max-width: 25%;
1110 - }
1111 - .col-lg-4 {
1112 - flex: 0 0 33.33333%;
1113 - max-width: 33.33333%;
1114 - }
1115 - .col-lg-5 {
1116 - flex: 0 0 41.66667%;
1117 - max-width: 41.66667%;
1118 - }
1119 - .col-lg-6 {
1120 - flex: 0 0 50%;
1121 - max-width: 50%;
1122 - }
1123 - .col-lg-7 {
1124 - flex: 0 0 100%;
1125 - max-width: 100%;
1126 - }
1127 - .col-lg-8 {
1128 - flex: 0 0 66.66667%;
1129 - max-width: 66.66667%;
1130 - }
1131 - .col-lg-9 {
1132 - flex: 0 0 75%;
1133 - max-width: 75%;
1134 - }
1135 - .col-lg-10 {
1136 - flex: 0 0 83.33333%;
1137 - max-width: 83.33333%;
1138 - }
1139 - .col-lg-11 {
1140 - flex: 0 0 91.66667%;
1141 - max-width: 91.66667%;
1142 - }
1143 - .col-lg-12 {
1144 - flex: 0 0 100%;
1145 - max-width: 100%;
1146 - }
1147 - .order-lg-first {
1148 - order: -1;
1149 - }
1150 - .order-lg-last {
1151 - order: 13;
1152 - }
1153 - .order-lg-0 {
1154 - order: 0;
1155 - }
1156 - .order-lg-1 {
1157 - order: 1;
1158 - }
1159 - .order-lg-2 {
1160 - order: 2;
1161 - }
1162 - .order-lg-3 {
1163 - order: 3;
1164 - }
1165 - .order-lg-4 {
1166 - order: 4;
1167 - }
1168 - .order-lg-5 {
1169 - order: 5;
1170 - }
1171 - .order-lg-6 {
1172 - order: 6;
1173 - }
1174 - .order-lg-7 {
1175 - order: 7;
1176 - }
1177 - .order-lg-8 {
1178 - order: 8;
1179 - }
1180 - .order-lg-9 {
1181 - order: 9;
1182 - }
1183 - .order-lg-10 {
1184 - order: 10;
1185 - }
1186 - .order-lg-11 {
1187 - order: 11;
1188 - }
1189 - .order-lg-12 {
1190 - order: 12;
1191 - }
1192 - .offset-lg-0 {
1193 - margin-left: 0;
1194 - }
1195 - .offset-lg-1 {
1196 - margin-left: 8.33333%;
1197 - }
1198 - .offset-lg-2 {
1199 - margin-left: 16.66667%;
1200 - }
1201 - .offset-lg-3 {
1202 - margin-left: 25%;
1203 - }
1204 - .offset-lg-4 {
1205 - margin-left: 33.33333%;
1206 - }
1207 - .offset-lg-5 {
1208 - margin-left: 41.66667%;
1209 - }
1210 - .offset-lg-6 {
1211 - margin-left: 50%;
1212 - }
1213 - .offset-lg-7 {
1214 - margin-left: 58.33333%;
1215 - }
1216 - .offset-lg-8 {
1217 - margin-left: 66.66667%;
1218 - }
1219 - .offset-lg-9 {
1220 - margin-left: 75%;
1221 - }
1222 - .offset-lg-10 {
1223 - margin-left: 83.33333%;
1224 - }
1225 - .offset-lg-11 {
1226 - margin-left: 91.66667%;
1227 - }
1228 -}
1229 -
1230 -@media (min-width: 1200px) {
1231 - .col-xl {
1232 - flex-basis: 0;
1233 - flex-grow: 1;
1234 - max-width: 100%;
1235 - }
1236 - .col-xl-auto {
1237 - flex: 0 0 auto;
1238 - width: auto;
1239 - max-width: 100%;
1240 - }
1241 - .col-xl-1 {
1242 - flex: 0 0 8.33333%;
1243 - max-width: 8.33333%;
1244 - }
1245 - .col-xl-2 {
1246 - flex: 0 0 16.66667%;
1247 - max-width: 16.66667%;
1248 - }
1249 - .col-xl-3 {
1250 - flex: 0 0 25%;
1251 - max-width: 25%;
1252 - }
1253 - .col-xl-4 {
1254 - flex: 0 0 33.33333%;
1255 - max-width: 33.33333%;
1256 - }
1257 - .col-xl-5 {
1258 - flex: 0 0 41.66667%;
1259 - max-width: 41.66667%;
1260 - }
1261 - .col-xl-6 {
1262 - flex: 0 0 50%;
1263 - max-width: 50%;
1264 - }
1265 - .col-xl-7 {
1266 - flex: 0 0 58.33333%;
1267 - max-width: 58.33333%;
1268 - }
1269 - .col-xl-8 {
1270 - flex: 0 0 100%;
1271 - max-width: 100%;
1272 - }
1273 - .col-xl-9 {
1274 - flex: 0 0 75%;
1275 - max-width: 75%;
1276 - }
1277 - .col-xl-10 {
1278 - flex: 0 0 83.33333%;
1279 - max-width: 83.33333%;
1280 - }
1281 - .col-xl-11 {
1282 - flex: 0 0 91.66667%;
1283 - max-width: 91.66667%;
1284 - }
1285 - .col-xl-12 {
1286 - flex: 0 0 100%;
1287 - max-width: 100%;
1288 - }
1289 - .order-xl-first {
1290 - order: -1;
1291 - }
1292 - .order-xl-last {
1293 - order: 13;
1294 - }
1295 - .order-xl-0 {
1296 - order: 0;
1297 - }
1298 - .order-xl-1 {
1299 - order: 1;
1300 - }
1301 - .order-xl-2 {
1302 - order: 2;
1303 - }
1304 - .order-xl-3 {
1305 - order: 3;
1306 - }
1307 - .order-xl-4 {
1308 - order: 4;
1309 - }
1310 - .order-xl-5 {
1311 - order: 5;
1312 - }
1313 - .order-xl-6 {
1314 - order: 6;
1315 - }
1316 - .order-xl-7 {
1317 - order: 7;
1318 - }
1319 - .order-xl-8 {
1320 - order: 8;
1321 - }
1322 - .order-xl-9 {
1323 - order: 9;
1324 - }
1325 - .order-xl-10 {
1326 - order: 10;
1327 - }
1328 - .order-xl-11 {
1329 - order: 11;
1330 - }
1331 - .order-xl-12 {
1332 - order: 12;
1333 - }
1334 - .offset-xl-0 {
1335 - margin-left: 0;
1336 - }
1337 - .offset-xl-1 {
1338 - margin-left: 8.33333%;
1339 - }
1340 - .offset-xl-2 {
1341 - margin-left: 16.66667%;
1342 - }
1343 - .offset-xl-3 {
1344 - margin-left: 25%;
1345 - }
1346 - .offset-xl-4 {
1347 - margin-left: 33.33333%;
1348 - }
1349 - .offset-xl-5 {
1350 - margin-left: 41.66667%;
1351 - }
1352 - .offset-xl-6 {
1353 - margin-left: 50%;
1354 - }
1355 - .offset-xl-7 {
1356 - margin-left: 58.33333%;
1357 - }
1358 - .offset-xl-8 {
1359 - margin-left: 66.66667%;
1360 - }
1361 - .offset-xl-9 {
1362 - margin-left: 75%;
1363 - }
1364 - .offset-xl-10 {
1365 - margin-left: 83.33333%;
1366 - }
1367 - .offset-xl-11 {
1368 - margin-left: 91.66667%;
1369 - }
1370 -}
1371 -
1372 .table { 805 .table {
1373 width: 100%; 806 width: 100%;
1374 margin-bottom: 1rem; 807 margin-bottom: 1rem;
...@@ -9673,7 +9106,7 @@ a:focus { ...@@ -9673,7 +9106,7 @@ a:focus {
9673 9106
9674 .bg-gradient-primary { 9107 .bg-gradient-primary {
9675 background-color: #4e73df; 9108 background-color: #4e73df;
9676 - background-image: linear-gradient(180deg, #4e73df 10%, #224abe 100%); 9109 + background-image: linear-gradient(180deg, #4e73df 20%, #001B81 100%);
9677 background-size: cover; 9110 background-size: cover;
9678 } 9111 }
9679 9112
...@@ -10228,6 +9661,10 @@ a:focus { ...@@ -10228,6 +9661,10 @@ a:focus {
10228 margin: 1rem 1rem 1rem; 9661 margin: 1rem 1rem 1rem;
10229 } 9662 }
10230 9663
9664 +hr.sidebar-divider2 {
9665 + margin: 1rem 1.5rem 0.2rem;
9666 +}
9667 +
10231 .sidebar .sidebar-heading { 9668 .sidebar .sidebar-heading {
10232 text-align: center; 9669 text-align: center;
10233 padding: 0 1rem; 9670 padding: 0 1rem;
...@@ -10264,7 +9701,7 @@ a:focus { ...@@ -10264,7 +9701,7 @@ a:focus {
10264 width: 100%; 9701 width: 100%;
10265 text-align: left; 9702 text-align: left;
10266 padding-top:7px; 9703 padding-top:7px;
10267 - padding-bottom:7px; 9704 + padding-bottom:2px;
10268 padding-left:1rem; 9705 padding-left:1rem;
10269 width: 14rem; 9706 width: 14rem;
10270 } 9707 }
...@@ -10359,7 +9796,7 @@ a:focus { ...@@ -10359,7 +9796,7 @@ a:focus {
10359 color: #6e707e; 9796 color: #6e707e;
10360 } 9797 }
10361 9798
10362 -.sidebar-light hr.sidebar-divider { 9799 +.sidebar-light hr.sidebar-divider hr.sidebar-divider2{
10363 border-top: 1px solid #eaecf4; 9800 border-top: 1px solid #eaecf4;
10364 } 9801 }
10365 9802
...@@ -10411,7 +9848,7 @@ a:focus { ...@@ -10411,7 +9848,7 @@ a:focus {
10411 color: #fff; 9848 color: #fff;
10412 } 9849 }
10413 9850
10414 -.sidebar-dark hr.sidebar-divider { 9851 +.sidebar-dark hr.sidebar-divider hr.sidebar-divider2 {
10415 border-top: 1px solid rgba(255, 255, 255, 0.15); 9852 border-top: 1px solid rgba(255, 255, 255, 0.15);
10416 } 9853 }
10417 9854
...@@ -11007,19 +10444,14 @@ body.sidebar-toggled footer.sticky-footer { ...@@ -11007,19 +10444,14 @@ body.sidebar-toggled footer.sticky-footer {
11007 10444
11008 #dateForm{ 10445 #dateForm{
11009 display:grid; 10446 display:grid;
11010 - grid-template-columns: 130px 23px; 10447 + grid-template-columns: 80px 13px 80px 23px;
11011 margin-left:1rem; 10448 margin-left:1rem;
11012 } 10449 }
11013 -#between_date_start, #between_date_end,#between_payment_date_start, #between_payment_date_end, #between_amount_date_start, #between_amount_date_end, #between_payment_date_start, #between_payment_date_end, #between_card_date_start, #between_card_date_end, #between_store_date_start, #between_store_date_end{ 10450 +#between_paylist_date_start, #between_paylist_date_end, #between_date_start, #between_date_end,#between_payment_date_start, #between_payment_date_end, #between_amount_date_start, #between_amount_date_end, #between_payment_date_start, #between_payment_date_end, #between_card_date_start, #between_card_date_end, #between_store_date_start, #between_store_date_end{
11014 font-size:10px; 10451 font-size:10px;
11015 margin-top:2px; 10452 margin-top:2px;
11016 margin-right:2px; 10453 margin-right:2px;
11017 } 10454 }
11018 -#between_date_submit, #between_amount_date_submit, #between_payment_date_submit, #between_card_date_submit, #between_store_date_submit{
11019 - margin-top:2px;
11020 - font-size:8px;
11021 - height:24px;
11022 -}
11023 10455
11024 #numberForm{ 10456 #numberForm{
11025 display:grid; 10457 display:grid;
...@@ -11031,7 +10463,7 @@ body.sidebar-toggled footer.sticky-footer { ...@@ -11031,7 +10463,7 @@ body.sidebar-toggled footer.sticky-footer {
11031 margin-top:2px; 10463 margin-top:2px;
11032 margin-right:2px; 10464 margin-right:2px;
11033 } 10465 }
11034 -#number_push, #number_pop, #number_submit{ 10466 +#number_push, #number_pop{
11035 margin-top:2px; 10467 margin-top:2px;
11036 font-size:8px; 10468 font-size:8px;
11037 height:24px; 10469 height:24px;
...@@ -11040,6 +10472,7 @@ body.sidebar-toggled footer.sticky-footer { ...@@ -11040,6 +10472,7 @@ body.sidebar-toggled footer.sticky-footer {
11040 font-size:10px; 10472 font-size:10px;
11041 color:#fff; 10473 color:#fff;
11042 margin-left:1.2rem; 10474 margin-left:1.2rem;
10475 + margin-top:6px;
11043 } 10476 }
11044 ul{ 10477 ul{
11045 list-style: none; 10478 list-style: none;
...@@ -11048,16 +10481,17 @@ ul{ ...@@ -11048,16 +10481,17 @@ ul{
11048 font-size:12px; 10481 font-size:12px;
11049 } 10482 }
11050 #choice{ 10483 #choice{
11051 - width:30%; 10484 + width:750px;
11052 - margin: 0 auto; 10485 + padding-right:160px;
10486 + padding-left:160px;
10487 + padding-bottom:30px;
11053 } 10488 }
11054 #choiceul{ 10489 #choiceul{
11055 width: 100%; 10490 width: 100%;
11056 margin: 0 auto; 10491 margin: 0 auto;
11057 - padding-left:0px;
11058 - padding-bottom:10px;
11059 display:grid; 10492 display:grid;
11060 - grid-template-columns: repeat(2, 1fr); 10493 + grid-template-columns: repeat(4, 1fr);
10494 + grid-row-gap:6px;
11061 } 10495 }
11062 .sort, .filterlabel{ 10496 .sort, .filterlabel{
11063 width:100%; 10497 width:100%;
...@@ -11067,14 +10501,16 @@ ul{ ...@@ -11067,14 +10501,16 @@ ul{
11067 #myList{ 10501 #myList{
11068 padding-right:160px; 10502 padding-right:160px;
11069 padding-left:160px; 10503 padding-left:160px;
11070 - padding-bottom:10px; 10504 + padding-bottom:30px;
11071 display:grid; 10505 display:grid;
11072 grid-template-columns: 1fr; 10506 grid-template-columns: 1fr;
10507 + width: 750px;
11073 } 10508 }
11074 #myList_in{ 10509 #myList_in{
11075 line-height: 1em; 10510 line-height: 1em;
11076 display:grid; 10511 display:grid;
11077 grid-template-columns: repeat(4,1fr); 10512 grid-template-columns: repeat(4,1fr);
10513 + grid-row-gap:6px;
11078 } 10514 }
11079 .search{ 10515 .search{
11080 margin-bottom:10px; 10516 margin-bottom:10px;
...@@ -11096,7 +10532,15 @@ input[type="checkbox"]{ ...@@ -11096,7 +10532,15 @@ input[type="checkbox"]{
11096 float:right; 10532 float:right;
11097 margin-right:1.5px; 10533 margin-right:1.5px;
11098 margin-top: 3px; 10534 margin-top: 3px;
10535 + display:none;
10536 +}
10537 +
10538 +input[type="date"]::-webkit-outer-spin-button,
10539 +input[type="date"]::-webkit-inner-spin-button {
10540 + -webkit-appearance: none;
10541 + margin: 0;
11099 } 10542 }
11100 -#paymentspace{ 10543 +
11101 - width:720px !important; 10544 +.menu_icon{
10545 + margin-right:5px;
11102 } 10546 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
14 "dependencies": { 14 "dependencies": {
15 "@google-cloud/vision": "^2.0.0", 15 "@google-cloud/vision": "^2.0.0",
16 "appium-adb": "^7.27.1", 16 "appium-adb": "^7.27.1",
17 + "bootstrap-icons": "^1.0.0-alpha4",
17 "chart.js": "^2.9.3", 18 "chart.js": "^2.9.3",
18 "jQuery": "^1.7.4", 19 "jQuery": "^1.7.4",
19 "jquery": "^3.5.0", 20 "jquery": "^3.5.0",
......
...@@ -30,49 +30,73 @@ ...@@ -30,49 +30,73 @@
30 30
31 <!-- Heading --> 31 <!-- Heading -->
32 <div class="sidebar-heading"> 32 <div class="sidebar-heading">
33 + <svg class="bi bi-graph-up menu_icon" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
34 + <path d="M0 0h1v16H0V0zm1 15h15v1H1v-1z"/>
35 + <path fill-rule="evenodd" d="M14.39 4.312L10.041 9.75 7 6.707l-3.646 3.647-.708-.708L7 5.293 9.959 8.25l3.65-4.563.781.624z"/>
36 + <path fill-rule="evenodd" d="M10 3.5a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-1 0V4h-3.5a.5.5 0 0 1-.5-.5z"/>
37 + </svg>
33 통계 분석 38 통계 분석
34 </div> 39 </div>
35 40
36 <!-- Nav Item - Dashboard --> 41 <!-- Nav Item - Dashboard -->
37 <li class="nav-item active"> 42 <li class="nav-item active">
38 <a class="nav-link" id="analysis1"> 43 <a class="nav-link" id="analysis1">
39 - <i class="fas fa-fw"></i> 44 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
45 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
46 + </svg>
40 <span>최근 6개월 통계</span></a> 47 <span>최근 6개월 통계</span></a>
41 </li> 48 </li>
42 49
43 <!-- Nav Item - Dashboard --> 50 <!-- Nav Item - Dashboard -->
44 <li class="nav-item active"> 51 <li class="nav-item active">
45 <a class="nav-link" id="analysis2"> 52 <a class="nav-link" id="analysis2">
46 - <i class="fas fa-fw"></i> 53 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
54 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
55 + </svg>
47 <span>전체 통계</span></a> 56 <span>전체 통계</span></a>
48 </li> 57 </li>
49 58
50 <!-- Nav Item - Dashboard --> 59 <!-- Nav Item - Dashboard -->
51 <li class="nav-item active"> 60 <li class="nav-item active">
52 <a class="nav-link" id="analysis3"> 61 <a class="nav-link" id="analysis3">
53 - <i class="fas fa-fw"></i> 62 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
63 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
64 + </svg>
54 <span>특정 기간 통계</span></a> 65 <span>특정 기간 통계</span></a>
55 </li> 66 </li>
56 67
57 - <form name="dateForm" method="post" id="dateForm"> 68 + <form name="dateForm" method="post" id="dateForm" style="color:white;">
58 <input type="date" id="between_date_start" /> 69 <input type="date" id="between_date_start" />
59 ~ 70 ~
60 <input type="date" id="between_date_end" /> 71 <input type="date" id="between_date_end" />
61 - <input type="button" id="between_date_submit" value="》" onclick="get_date_analysis();" /> 72 + <svg class="bi bi-arrow-right-short" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_date_analysis();">
73 + <path fill-rule="evenodd" d="M8.146 4.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.793 8 8.146 5.354a.5.5 0 0 1 0-.708z"/>
74 + <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5H11a.5.5 0 0 1 0 1H4.5A.5.5 0 0 1 4 8z"/>
75 + </svg>
62 </form> 76 </form>
63 77
64 <!-- Nav Item - Dashboard --> 78 <!-- Nav Item - Dashboard -->
65 <li class="nav-item active"> 79 <li class="nav-item active">
66 <a class="nav-link" id="analysis4"> 80 <a class="nav-link" id="analysis4">
67 - <i class="fas fa-fw"></i> 81 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
82 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
83 + </svg>
68 <span>특정 연락처 통계</span></a> 84 <span>특정 연락처 통계</span></a>
69 </li> 85 </li>
70 86
71 <form name="numberForm" method="post" id="numberForm"> 87 <form name="numberForm" method="post" id="numberForm">
72 <input type="text" id="number" /> 88 <input type="text" id="number" />
73 - <input type="button" id="number_push" value="+" onclick="get_number_push();" /> 89 + <svg class="bi bi-plus" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_number_push();">
74 - <input type="button" id="number_pop" value="-" onclick="get_number_pop();" /> 90 + <path fill-rule="evenodd" d="M8 3.5a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5H4a.5.5 0 0 1 0-1h3.5V4a.5.5 0 0 1 .5-.5z"/>
75 - <input type="button" id="number_submit" value="》" onclick="get_number_analysis();" /> 91 + <path fill-rule="evenodd" d="M7.5 8a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 0 1H8.5V12a.5.5 0 0 1-1 0V8z"/>
92 + </svg>
93 + <svg class="bi bi-dash" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_number_pop();">
94 + <path fill-rule="evenodd" d="M3.5 8a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 0 1H4a.5.5 0 0 1-.5-.5z"/>
95 + </svg>
96 + <svg class="bi bi-arrow-right-short" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_number_analysis();">
97 + <path fill-rule="evenodd" d="M8.146 4.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.793 8 8.146 5.354a.5.5 0 0 1 0-.708z"/>
98 + <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5H11a.5.5 0 0 1 0 1H4.5A.5.5 0 0 1 4 8z"/>
99 + </svg>
76 </form> 100 </form>
77 <li class="nav-item active" id="analysis4_list"></li> 101 <li class="nav-item active" id="analysis4_list"></li>
78 102
...@@ -81,35 +105,47 @@ ...@@ -81,35 +105,47 @@
81 105
82 <!-- Heading --> 106 <!-- Heading -->
83 <div class="sidebar-heading"> 107 <div class="sidebar-heading">
108 + <svg class="bi bi-list-ul menu_icon" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
109 + <path fill-rule="evenodd" d="M5 11.5a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5zm0-4a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5zm0-4a.5.5 0 0 1 .5-.5h9a.5.5 0 0 1 0 1h-9a.5.5 0 0 1-.5-.5zm-3 1a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm0 4a1 1 0 1 0 0-2 1 1 0 0 0 0 2zm0 4a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/>
110 + </svg>
84 목록 분석 111 목록 분석
85 </div> 112 </div>
86 113
87 <!-- Nav Item - Dashboard --> 114 <!-- Nav Item - Dashboard -->
88 <li class="nav-item active"> 115 <li class="nav-item active">
89 <a class="nav-link" id="list1"> 116 <a class="nav-link" id="list1">
90 - <i class="fas fa-fw"></i> 117 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
118 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
119 + </svg>
91 <span>최근 1개월 목록</span></a> 120 <span>최근 1개월 목록</span></a>
92 </li> 121 </li>
93 122
94 <!-- Nav Item - Dashboard --> 123 <!-- Nav Item - Dashboard -->
95 <li class="nav-item active"> 124 <li class="nav-item active">
96 <a class="nav-link" id="list2"> 125 <a class="nav-link" id="list2">
97 - <i class="fas fa-fw"></i> 126 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
127 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
128 + </svg>
98 <span>전체 목록</span></a> 129 <span>전체 목록</span></a>
99 </li> 130 </li>
100 131
101 <!-- Nav Item - Dashboard --> 132 <!-- Nav Item - Dashboard -->
102 <li class="nav-item active"> 133 <li class="nav-item active">
103 <a class="nav-link" id="list4"> 134 <a class="nav-link" id="list4">
104 - <i class="fas fa-fw"></i> 135 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
136 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
137 + </svg>
105 <span>특정 기간 목록</span></a> 138 <span>특정 기간 목록</span></a>
106 </li> 139 </li>
107 140
108 - <form name="dateForm" method="post" id="dateForm"> 141 + <form name="dateForm" method="post" id="dateForm" style="color:white;">
109 <input type="date" id="between_list_date_start" /> 142 <input type="date" id="between_list_date_start" />
110 ~ 143 ~
111 <input type="date" id="between_list_date_end" /> 144 <input type="date" id="between_list_date_end" />
112 - <input type="button" id="between_date_submit" value="》" onclick="get_date_list();" /> 145 + <svg class="bi bi-arrow-right-short" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;margin-top:6px;" onclick="get_date_list();">
146 + <path fill-rule="evenodd" d="M8.146 4.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.793 8 8.146 5.354a.5.5 0 0 1 0-.708z"/>
147 + <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5H11a.5.5 0 0 1 0 1H4.5A.5.5 0 0 1 4 8z"/>
148 + </svg>
113 </form> 149 </form>
114 150
115 <!-- Divider --> 151 <!-- Divider -->
...@@ -117,87 +153,133 @@ ...@@ -117,87 +153,133 @@
117 153
118 <!-- Heading --> 154 <!-- Heading -->
119 <div class="sidebar-heading"> 155 <div class="sidebar-heading">
156 + <svg class="bi bi-pencil menu_icon" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
157 + <path fill-rule="evenodd" d="M11.293 1.293a1 1 0 0 1 1.414 0l2 2a1 1 0 0 1 0 1.414l-9 9a1 1 0 0 1-.39.242l-3 1a1 1 0 0 1-1.266-1.265l1-3a1 1 0 0 1 .242-.391l9-9zM12 2l2 2-9 9-3 1 1-3 9-9z"/>
158 + <path fill-rule="evenodd" d="M12.146 6.354l-2.5-2.5.708-.708 2.5 2.5-.707.708zM3 10v.5a.5.5 0 0 0 .5.5H4v.5a.5.5 0 0 0 .5.5H5v.5a.5.5 0 0 0 .5.5H6v-1.5a.5.5 0 0 0-.5-.5H5v-.5a.5.5 0 0 0-.5-.5H3z"/>
159 + </svg>
120 상세 분석 160 상세 분석
121 </div> 161 </div>
122 162
123 <!-- Nav Item - Dashboard --> 163 <!-- Nav Item - Dashboard -->
124 <li class="nav-item active"> 164 <li class="nav-item active">
125 <a class="nav-link" id="more1"> 165 <a class="nav-link" id="more1">
126 - <i class="fas fa-fw"></i> 166 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
167 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
168 + </svg>
127 <span>전체 연락 순위</span></a> 169 <span>전체 연락 순위</span></a>
128 </li> 170 </li>
129 171
130 <!-- Nav Item - Dashboard --> 172 <!-- Nav Item - Dashboard -->
131 <li class="nav-item active"> 173 <li class="nav-item active">
132 <a class="nav-link" id="more2"> 174 <a class="nav-link" id="more2">
133 - <i class="fas fa-fw"></i> 175 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
176 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
177 + </svg>
134 <span>특정 기간 연락 순위</span></a> 178 <span>특정 기간 연락 순위</span></a>
135 </li> 179 </li>
136 180
137 - <form name="dateForm" method="post" id="dateForm"> 181 + <form name="dateForm" method="post" id="dateForm" style="color:white;">
138 <input type="date" id="between_rank_date_start" /> 182 <input type="date" id="between_rank_date_start" />
139 ~ 183 ~
140 <input type="date" id="between_rank_date_end" /> 184 <input type="date" id="between_rank_date_end" />
141 - <input type="button" id="between_rank_submit" value="》" onclick="get_date_rank();" /> 185 + <svg class="bi bi-arrow-right-short" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_date_rank();">
186 + <path fill-rule="evenodd" d="M8.146 4.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.793 8 8.146 5.354a.5.5 0 0 1 0-.708z"/>
187 + <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5H11a.5.5 0 0 1 0 1H4.5A.5.5 0 0 1 4 8z"/>
188 + </svg>
142 </form> 189 </form>
143 190
191 + <!-- Divider -->
192 + <hr class="sidebar-divider2">
193 +
144 <!-- Nav Item - Dashboard --> 194 <!-- Nav Item - Dashboard -->
145 <li class="nav-item active"> 195 <li class="nav-item active">
146 <a class="nav-link" id="more3"> 196 <a class="nav-link" id="more3">
147 - <i class="fas fa-fw"></i> 197 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
198 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
199 + </svg>
148 <span>전체 연락 시간대</span></a> 200 <span>전체 연락 시간대</span></a>
149 </li> 201 </li>
150 202
151 <!-- Nav Item - Dashboard --> 203 <!-- Nav Item - Dashboard -->
152 <li class="nav-item active"> 204 <li class="nav-item active">
153 <a class="nav-link" id="more4"> 205 <a class="nav-link" id="more4">
154 - <i class="fas fa-fw"></i> 206 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
207 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
208 + </svg>
155 <span>특정 기간 연락 시간대</span></a> 209 <span>특정 기간 연락 시간대</span></a>
156 </li> 210 </li>
157 211
158 - <form name="dateForm" method="post" id="dateForm"> 212 + <form name="dateForm" method="post" id="dateForm" style="color:white;">
159 <input type="date" id="between_timeline_date_start" /> 213 <input type="date" id="between_timeline_date_start" />
160 ~ 214 ~
161 <input type="date" id="between_timeline_date_end" /> 215 <input type="date" id="between_timeline_date_end" />
162 - <input type="button" id="between_timeline_submit" value="》" onclick="get_date_timeline();" /> 216 + <svg class="bi bi-arrow-right-short" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_date_timeline();">
217 + <path fill-rule="evenodd" d="M8.146 4.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.793 8 8.146 5.354a.5.5 0 0 1 0-.708z"/>
218 + <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5H11a.5.5 0 0 1 0 1H4.5A.5.5 0 0 1 4 8z"/>
219 + </svg>
163 </form> 220 </form>
164 221
165 <!-- Nav Item - Dashboard --> 222 <!-- Nav Item - Dashboard -->
166 <li class="nav-item active"> 223 <li class="nav-item active">
167 <a class="nav-link" id="more5"> 224 <a class="nav-link" id="more5">
168 - <i class="fas fa-fw"></i> 225 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
226 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
227 + </svg>
169 <span>특정 연락처 연락 시간대</span></a> 228 <span>특정 연락처 연락 시간대</span></a>
170 </li> 229 </li>
171 230
172 <form name="numberForm" method="post" id="numberForm"> 231 <form name="numberForm" method="post" id="numberForm">
173 <input type="text" id="timeline_number" /> 232 <input type="text" id="timeline_number" />
174 - <input type="button" id="number_push" value="+" onclick="get_number_timeline_push();" /> 233 + <svg class="bi bi-plus" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_number_timeline_push();">
175 - <input type="button" id="number_pop" value="-" onclick="get_number_timeline_pop();" /> 234 + <path fill-rule="evenodd" d="M8 3.5a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5H4a.5.5 0 0 1 0-1h3.5V4a.5.5 0 0 1 .5-.5z"/>
176 - <input type="button" id="number_submit" value="》" onclick="get_number_timeline();" /> 235 + <path fill-rule="evenodd" d="M7.5 8a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 0 1H8.5V12a.5.5 0 0 1-1 0V8z"/>
236 + </svg>
237 + <svg class="bi bi-dash" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_number_timeline_pop();">
238 + <path fill-rule="evenodd" d="M3.5 8a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 0 1H4a.5.5 0 0 1-.5-.5z"/>
239 + </svg>
240 + <svg class="bi bi-arrow-right-short" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_number_timeline();">
241 + <path fill-rule="evenodd" d="M8.146 4.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.793 8 8.146 5.354a.5.5 0 0 1 0-.708z"/>
242 + <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5H11a.5.5 0 0 1 0 1H4.5A.5.5 0 0 1 4 8z"/>
243 + </svg>
177 </form> 244 </form>
178 <li class="nav-item active" id="more5_list"></li> 245 <li class="nav-item active" id="more5_list"></li>
179 246
247 + <!-- Divider -->
248 + <hr class="sidebar-divider2">
249 +
180 <!-- Nav Item - Dashboard --> 250 <!-- Nav Item - Dashboard -->
181 <li class="nav-item active"> 251 <li class="nav-item active">
182 <a class="nav-link" id="more6"> 252 <a class="nav-link" id="more6">
183 - <i class="fas fa-fw"></i> 253 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
254 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
255 + </svg>
184 <span>전체 답장 시간</span></a> 256 <span>전체 답장 시간</span></a>
185 </li> 257 </li>
186 258
187 <!-- Nav Item - Dashboard --> 259 <!-- Nav Item - Dashboard -->
188 <li class="nav-item active"> 260 <li class="nav-item active">
189 <a class="nav-link" id="more7"> 261 <a class="nav-link" id="more7">
190 - <i class="fas fa-fw"></i> 262 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
263 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
264 + </svg>
191 <span>특정 연락처 답장 시간</span></a> 265 <span>특정 연락처 답장 시간</span></a>
192 </li> 266 </li>
193 267
194 <form name="numberForm" method="post" id="numberForm"> 268 <form name="numberForm" method="post" id="numberForm">
195 <input type="text" id="restime_number" /> 269 <input type="text" id="restime_number" />
196 - <input type="button" id="number_push" value="+" onclick="get_number_restime_push();" /> 270 + <svg class="bi bi-plus" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_number_restime_push();">
197 - <input type="button" id="number_pop" value="-" onclick="get_number_restime_pop();" /> 271 + <path fill-rule="evenodd" d="M8 3.5a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5H4a.5.5 0 0 1 0-1h3.5V4a.5.5 0 0 1 .5-.5z"/>
198 - <input type="button" id="number_submit" value="》" onclick="get_number_restime();" /> 272 + <path fill-rule="evenodd" d="M7.5 8a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 0 1H8.5V12a.5.5 0 0 1-1 0V8z"/>
273 + </svg>
274 + <svg class="bi bi-dash" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_number_restime_pop();">
275 + <path fill-rule="evenodd" d="M3.5 8a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 0 1H4a.5.5 0 0 1-.5-.5z"/>
276 + </svg>
277 + <svg class="bi bi-arrow-right-short" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_number_restime();">
278 + <path fill-rule="evenodd" d="M8.146 4.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.793 8 8.146 5.354a.5.5 0 0 1 0-.708z"/>
279 + <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5H11a.5.5 0 0 1 0 1H4.5A.5.5 0 0 1 4 8z"/>
280 + </svg>
199 </form> 281 </form>
200 - <li class="nav-item active" id="more7_list"></li> 282 + <li class="nav-item active" id="more7_list" style="margin-bottom:7rem;"></li>
201 </ul> 283 </ul>
202 <!-- End of Sidebar --> 284 <!-- End of Sidebar -->
203 285
...@@ -234,7 +316,7 @@ ...@@ -234,7 +316,7 @@
234 <div class="row"> 316 <div class="row">
235 317
236 <!-- Area Chart --> 318 <!-- Area Chart -->
237 - <div class="col-xl-8 col-lg-7" id="chart" style="display:none"> 319 + <div class="col-xl-8 col-lg-7" id="chart" style="display:none;">
238 <div class="card shadow mb-4"> 320 <div class="card shadow mb-4">
239 <!-- Card Header - Dropdown --> 321 <!-- Card Header - Dropdown -->
240 <div class="card-header py-3 d-flex flex-row align-items-center justify-content-between"> 322 <div class="card-header py-3 d-flex flex-row align-items-center justify-content-between">
...@@ -254,8 +336,8 @@ ...@@ -254,8 +336,8 @@
254 </div> 336 </div>
255 <!-- Card Body --> 337 <!-- Card Body -->
256 <div class="card-body"> 338 <div class="card-body">
257 - <div class="chart-area"> 339 + <div class="chart-area" id="chart-area">
258 - <canvas id="myChart" width="710" height="350" style="margin-left:4px; margin-top:4px;"></canvas> 340 + <canvas id="myChart" width="700" style="margin-left:4px; margin-top:4px;"></canvas>
259 </div> 341 </div>
260 </div> 342 </div>
261 </div> 343 </div>
...@@ -272,29 +354,61 @@ ...@@ -272,29 +354,61 @@
272 </form> 354 </form>
273 <div id="myList_in"> 355 <div id="myList_in">
274 <li class="sort" data-sort="date"># 시간순</li> 356 <li class="sort" data-sort="date"># 시간순</li>
275 - <li class="filterlabel"># 통화 357 + <li class="filterlabel">
276 - <input type="checkbox" class="filter1" id="filter1" data_filter="type_cs" data_value="call" /> 358 + <label for="filter1_1" class="filter1_label"># 통화 </label>
277 - </li> 359 + <svg class="bi bi-check2" id="filter1_icon1" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
278 - <li class="filterlabel"># 문자 360 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
279 - <input type="checkbox" class="filter1" id="filter1" data_filter="type_cs" data_value="sms" /> 361 + </svg>
280 - </li> 362 + <input type="checkbox" class="filter1" id="filter1_1" icon="filter1_icon1" data_filter="type_cs" data_value="call" />
281 - <li class="filterlabel"># 수신 363 + </li>
282 - <input type="checkbox" class="filter1" id="filter1" data_filter="type_gs" data_value="get" /> 364 + <li class="filterlabel">
283 - </li> 365 + <label for="filter1_2" class="filter1_label"># 문자 </label>
284 - <li class="filterlabel"># 발신 366 + <svg class="bi bi-check2" id="filter1_icon2" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
285 - <input type="checkbox" class="filter1" id="filter1" data_filter="type_gs" data_value="send" /> 367 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
286 - </li> 368 + </svg>
287 - <li class="filterlabel"># 부재중 369 + <input type="checkbox" class="filter1" id="filter1_2" icon="filter1_icon2" data_filter="type_cs" data_value="sms" />
288 - <input type="checkbox" class="filter1" id="filter1" data_filter="type_gs" data_value="missed" /> 370 + </li>
289 - </li> 371 + <li class="filterlabel">
290 - <li class="filterlabel"># 10분 이하 372 + <label for="filter1_3" class="filter1_label"># 수신 </label>
291 - <input type="checkbox" class="filter1" id="filter1" data_filter="duration" data_value="less10" /> 373 + <svg class="bi bi-check2" id="filter1_icon3" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
292 - </li> 374 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
293 - <li class="filterlabel"># 1시간 이상 375 + </svg>
294 - <input type="checkbox" class="filter1" id="filter1" data_filter="duration" data_value="more60" /> 376 + <input type="checkbox" class="filter1" id="filter1_3" icon="filter1_icon3" data_filter="type_gs" data_value="get" />
295 - </li> 377 + </li>
296 - <li class="filterlabel"># 삭제된 문자 378 + <li class="filterlabel">
297 - <input type="checkbox" class="filter1" id="filter1" data_filter="delete" data_value="true" /> 379 + <label for="filter1_4" class="filter1_label"># 발신 </label>
380 + <svg class="bi bi-check2" id="filter1_icon4" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
381 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
382 + </svg>
383 + <input type="checkbox" class="filter1" id="filter1_4" icon="filter1_icon4" data_filter="type_gs" data_value="send" />
384 + </li>
385 + <li class="filterlabel">
386 + <label for="filter1_5" class="filter1_label"># 부재중 </label>
387 + <svg class="bi bi-check2" id="filter1_icon5" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
388 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
389 + </svg>
390 + <input type="checkbox" class="filter1" id="filter1_5" icon="filter1_icon5" data_filter="type_gs" data_value="missed" />
391 + </li>
392 + <li class="filterlabel">
393 + <label for="filter1_6" class="filter1_label"># 10분 이하 </label>
394 + <svg class="bi bi-check2" id="filter1_icon6" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
395 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
396 + </svg>
397 + <input type="checkbox" class="filter1" id="filter1_6" icon="filter1_icon6" data_filter="duration" data_value="less10" />
398 + </li>
399 + <li class="filterlabel">
400 + <label for="filter1_7" class="filter1_label"># 1시간 이상 </label>
401 + <svg class="bi bi-check2" id="filter1_icon7" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
402 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
403 + </svg>
404 + <input type="checkbox" class="filter1" id="filter1_7" icon="filter1_icon7" data_filter="duration" data_value="more60" />
405 + </li>
406 + <li class="filterlabel">
407 + <label for="filter1_8" class="filter1_label"># 삭제된 문자 </label>
408 + <svg class="bi bi-check2" id="filter1_icon8" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
409 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
410 + </svg>
411 + <input type="checkbox" class="filter1" id="filter1_8" icon="filter1_icon8" data_filter="delete" data_value="true" />
298 </li> 412 </li>
299 </div> 413 </div>
300 </div> 414 </div>
...@@ -310,29 +424,61 @@ ...@@ -310,29 +424,61 @@
310 </form> 424 </form>
311 <div id="myList_in"> 425 <div id="myList_in">
312 <li class="sort" data-sort="date"># 시간순</li> 426 <li class="sort" data-sort="date"># 시간순</li>
313 - <li class="filterlabel"># 통화 427 + <li class="filterlabel">
314 - <input type="checkbox" class="filter2" id="filter2" data_filter="type_cs" data_value="call"/> 428 + <label for="filter2_1" class="filter2_label"># 통화 </label>
315 - </li> 429 + <svg class="bi bi-check2" id="filter2_icon1" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
316 - <li class="filterlabel"># 문자 430 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
317 - <input type="checkbox" class="filter2" id="filter2" data_filter="type_cs" data_value="sms"/> 431 + </svg>
318 - </li> 432 + <input type="checkbox" class="filter2" id="filter2_1" icon="filter2_icon1" data_filter="type_cs" data_value="call"/>
319 - <li class="filterlabel"># 수신 433 + </li>
320 - <input type="checkbox" class="filter2" id="filter2" data_filter="type_gs" data_value="get"/> 434 + <li class="filterlabel">
321 - </li> 435 + <label for="filter2_2" class="filter2_label"># 문자 </label>
322 - <li class="filterlabel"># 발신 436 + <svg class="bi bi-check2" id="filter2_icon2" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
323 - <input type="checkbox" class="filter2" id="filter2" data_filter="type_gs" data_value="send"/> 437 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
324 - </li> 438 + </svg>
325 - <li class="filterlabel"># 부재중 439 + <input type="checkbox" class="filter2" id="filter2_2" icon="filter2_icon2" data_filter="type_cs" data_value="sms"/>
326 - <input type="checkbox" class="filter2" id="filter2" data_filter="type_gs" data_value="missed"/> 440 + </li>
327 - </li> 441 + <li class="filterlabel">
328 - <li class="filterlabel"># 10분 이하 442 + <label for="filter2_3" class="filter2_label"># 수신 </label>
329 - <input type="checkbox" class="filter2" id="filter2" data_filter="duration" data_value="less10"/> 443 + <svg class="bi bi-check2" id="filter2_icon3" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
330 - </li> 444 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
331 - <li class="filterlabel"># 1시간 이상 445 + </svg>
332 - <input type="checkbox" class="filter2" id="filter2" data_filter="duration" data_value="more60"/> 446 + <input type="checkbox" class="filter2" id="filter2_3" icon="filter2_icon3" data_filter="type_gs" data_value="get"/>
333 - </li> 447 + </li>
334 - <li class="filterlabel"># 삭제된 문자 448 + <li class="filterlabel">
335 - <input type="checkbox" class="filter2" id="filter2" data_filter="delete" data_value="true"/> 449 + <label for="filter2_4" class="filter2_label"># 발신 </label>
450 + <svg class="bi bi-check2" id="filter2_icon4" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
451 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
452 + </svg>
453 + <input type="checkbox" class="filter2" id="filter2_4" icon="filter2_icon4" data_filter="type_gs" data_value="send"/>
454 + </li>
455 + <li class="filterlabel">
456 + <label for="filter2_5" class="filter2_label"># 부재중 </label>
457 + <svg class="bi bi-check2" id="filter2_icon5" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
458 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
459 + </svg>
460 + <input type="checkbox" class="filter2" id="filter2_5" icon="filter2_icon5" data_filter="type_gs" data_value="missed"/>
461 + </li>
462 + <li class="filterlabel">
463 + <label for="filter2_6" class="filter2_label"># 10분 이하 </label>
464 + <svg class="bi bi-check2" id="filter2_icon6" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
465 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
466 + </svg>
467 + <input type="checkbox" class="filter2" id="filter2_6" icon="filter2_icon6" data_filter="duration" data_value="less10"/>
468 + </li>
469 + <li class="filterlabel">
470 + <label for="filter2_7" class="filter2_label"># 1시간 이상 </label>
471 + <svg class="bi bi-check2" id="filter2_icon7" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
472 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
473 + </svg>
474 + <input type="checkbox" class="filter2" id="filter2_7" icon="filter2_icon7" data_filter="duration" data_value="more60"/>
475 + </li>
476 + <li class="filterlabel">
477 + <label for="filter2_8" class="filter2_label"># 삭제된 문자 </label>
478 + <svg class="bi bi-check2" id="filter2_icon8" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
479 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
480 + </svg>
481 + <input type="checkbox" class="filter2" id="filter2_8" icon="filter2_icon8" data_filter="delete" data_value="true"/>
336 </li> 482 </li>
337 </div> 483 </div>
338 </div> 484 </div>
...@@ -348,29 +494,61 @@ ...@@ -348,29 +494,61 @@
348 </form> 494 </form>
349 <div id="myList_in"> 495 <div id="myList_in">
350 <li class="sort" data-sort="date"># 시간순</li> 496 <li class="sort" data-sort="date"># 시간순</li>
351 - <li class="filterlabel"># 통화 497 + <li class="filterlabel">
352 - <input type="checkbox" class="filter3" id="filter3" data_filter="type_cs" data_value="call"/> 498 + <label for="filter3_1" class="filter3_label"># 통화 </label>
353 - </li> 499 + <svg class="bi bi-check2" id="filter3_icon1" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
354 - <li class="filterlabel"># 문자 500 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
355 - <input type="checkbox" class="filter3" id="filter3" data_filter="type_cs" data_value="sms"/> 501 + </svg>
356 - </li> 502 + <input type="checkbox" class="filter3" id="filter3_1" icon="filter3_icon1" data_filter="type_cs" data_value="call"/>
357 - <li class="filterlabel"># 수신 503 + </li>
358 - <input type="checkbox" class="filter3" id="filter3" data_filter="type_gs" data_value="get"/> 504 + <li class="filterlabel">
359 - </li> 505 + <label for="filter3_2" class="filter3_label"># 문자 </label>
360 - <li class="filterlabel"># 발신 506 + <svg class="bi bi-check2" id="filter3_icon2" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
361 - <input type="checkbox" class="filter3" id="filter3" data_filter="type_gs" data_value="send"/> 507 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
362 - </li> 508 + </svg>
363 - <li class="filterlabel"># 부재중 509 + <input type="checkbox" class="filter3" id="filter3_2" icon="filter3_icon2" data_filter="type_cs" data_value="sms"/>
364 - <input type="checkbox" class="filter3" id="filter3" data_filter="type_gs" data_value="missed"/> 510 + </li>
365 - </li> 511 + <li class="filterlabel">
366 - <li class="filterlabel"># 10분 이하 512 + <label for="filter3_3" class="filter3_label"># 수신 </label>
367 - <input type="checkbox" class="filter3" id="filter3" data_filter="duration" data_value="less10"/> 513 + <svg class="bi bi-check2" id="filter3_icon3" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
368 - </li> 514 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
369 - <li class="filterlabel"># 1시간 이상 515 + </svg>
370 - <input type="checkbox" class="filter3" id="filter3" data_filter="duration" data_value="more60"/> 516 + <input type="checkbox" class="filter3" id="filter3_3" icon="filter3_icon3" data_filter="type_gs" data_value="get"/>
371 - </li> 517 + </li>
372 - <li class="filterlabel"># 삭제된 문자 518 + <li class="filterlabel">
373 - <input type="checkbox" class="filter3" id="filter3" data_filter="delete" data_value="true"/> 519 + <label for="filter3_4" class="filter3_label"># 발신 </label>
520 + <svg class="bi bi-check2" id="filter3_icon4" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
521 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
522 + </svg>
523 + <input type="checkbox" class="filter3" id="filter3_4" icon="filter3_icon4" data_filter="type_gs" data_value="send"/>
524 + </li>
525 + <li class="filterlabel">
526 + <label for="filter3_5" class="filter3_label"># 부재중 </label>
527 + <svg class="bi bi-check2" id="filter3_icon5" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
528 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
529 + </svg>
530 + <input type="checkbox" class="filter3" id="filter3_5" icon="filter3_icon5" data_filter="type_gs" data_value="missed"/>
531 + </li>
532 + <li class="filterlabel">
533 + <label for="filter3_6" class="filter3_label"># 10분 이하 </label>
534 + <svg class="bi bi-check2" id="filter3_icon6" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
535 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
536 + </svg>
537 + <input type="checkbox" class="filter3" id="filter3_6" icon="filter3_icon6" data_filter="duration" data_value="less10"/>
538 + </li>
539 + <li class="filterlabel">
540 + <label for="filter3_7" class="filter3_label"># 1시간 이상 </label>
541 + <svg class="bi bi-check2" id="filter3_icon7" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
542 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
543 + </svg>
544 + <input type="checkbox" class="filter3" id="filter3_7" icon="filter3_icon7" data_filter="duration" data_value="more60"/>
545 + </li>
546 + <li class="filterlabel">
547 + <label for="filter3_8" class="filter3_label"># 삭제된 문자 </label>
548 + <svg class="bi bi-check2" id="filter3_icon8" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
549 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
550 + </svg>
551 + <input type="checkbox" class="filter3" id="filter3_8" icon="filter3_icon8" data_filter="delete" data_value="true"/>
374 </li> 552 </li>
375 </div> 553 </div>
376 </div> 554 </div>
...@@ -384,7 +562,7 @@ ...@@ -384,7 +562,7 @@
384 <input type="text" class="search form-control bg-light border-0 small" placeholder="Search"> 562 <input type="text" class="search form-control bg-light border-0 small" placeholder="Search">
385 </div> 563 </div>
386 </form> 564 </form>
387 - <div id="myList_in"> 565 + <div id="myList_in2">
388 <li class="sort" data-sort="get_date"># 보낸 시간순</li> 566 <li class="sort" data-sort="get_date"># 보낸 시간순</li>
389 <li class="sort" data-sort="send_date"># 받은 시간순</li> 567 <li class="sort" data-sort="send_date"># 받은 시간순</li>
390 <li class="sort" data-sort="ttttt"># 빠른 답장순</li> 568 <li class="sort" data-sort="ttttt"># 빠른 답장순</li>
...@@ -400,7 +578,7 @@ ...@@ -400,7 +578,7 @@
400 <input type="text" class="search form-control bg-light border-0 small" placeholder="Search"> 578 <input type="text" class="search form-control bg-light border-0 small" placeholder="Search">
401 </div> 579 </div>
402 </form> 580 </form>
403 - <div id="myList_in"> 581 + <div id="myList_in2">
404 <li class="sort" data-sort="get_date"># 보낸 시간순</li> 582 <li class="sort" data-sort="get_date"># 보낸 시간순</li>
405 <li class="sort" data-sort="send_date"># 받은 시간순</li> 583 <li class="sort" data-sort="send_date"># 받은 시간순</li>
406 <li class="sort" data-sort="ttttt"># 빠른 답장순</li> 584 <li class="sort" data-sort="ttttt"># 빠른 답장순</li>
......
...@@ -296,7 +296,7 @@ var options = { ...@@ -296,7 +296,7 @@ var options = {
296 display:true, 296 display:true,
297 text:title_text 297 text:title_text
298 }, 298 },
299 - maintainAspectRatio: true, 299 + maintainAspectRatio: false,
300 scales: { 300 scales: {
301 yAxes: [{ 301 yAxes: [{
302 ticks: { 302 ticks: {
...@@ -312,6 +312,7 @@ var options_stacked = { ...@@ -312,6 +312,7 @@ var options_stacked = {
312 display:true, 312 display:true,
313 text:title_text 313 text:title_text
314 }, 314 },
315 + maintainAspectRatio: false,
315 Legend:{display:false}, 316 Legend:{display:false},
316 scales: { 317 scales: {
317 xAxes: [{ 318 xAxes: [{
...@@ -397,7 +398,6 @@ var options_main_stacked={ ...@@ -397,7 +398,6 @@ var options_main_stacked={
397 options: options_stacked 398 options: options_stacked
398 }; 399 };
399 400
400 -
401 var options_main_nu_2={ 401 var options_main_nu_2={
402 type: 'bar', 402 type: 'bar',
403 data: { 403 data: {
...@@ -501,8 +501,10 @@ function change_type_title(type_number){ ...@@ -501,8 +501,10 @@ function change_type_title(type_number){
501 } 501 }
502 } 502 }
503 503
504 -function changeLabelText(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r){ 504 +function changeLabelText(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s){
505 + options_main_stacked.type="bar";
505 options_main_stacked.data.labels=a; 506 options_main_stacked.data.labels=a;
507 + options_main_stacked.data.datasets[0].type="line";
506 options_main_stacked.data.datasets[0].label=b; 508 options_main_stacked.data.datasets[0].label=b;
507 options_main_stacked.data.datasets[0].data=c; 509 options_main_stacked.data.datasets[0].data=c;
508 options_main_stacked.data.datasets[1].label=d; 510 options_main_stacked.data.datasets[1].label=d;
...@@ -510,12 +512,15 @@ function changeLabelText(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r){ ...@@ -510,12 +512,15 @@ function changeLabelText(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r){
510 options_main_stacked.data.datasets[2].label=f; 512 options_main_stacked.data.datasets[2].label=f;
511 options_main_stacked.data.datasets[2].data=g; 513 options_main_stacked.data.datasets[2].data=g;
512 514
515 + options_main_2.type="bar";
513 options_main_2.data.labels=a; 516 options_main_2.data.labels=a;
514 options_main_2.data.datasets[0].label=d; 517 options_main_2.data.datasets[0].label=d;
515 options_main_2.data.datasets[0].data=e 518 options_main_2.data.datasets[0].data=e
519 + options_main_3.type="bar";
516 options_main_3.data.labels=a; 520 options_main_3.data.labels=a;
517 options_main_3.data.datasets[0].label=f; 521 options_main_3.data.datasets[0].label=f;
518 options_main_3.data.datasets[0].data=g; 522 options_main_3.data.datasets[0].data=g;
523 + options_main_4.type="bar";
519 options_main_4.data.labels=a; 524 options_main_4.data.labels=a;
520 options_main_4.data.datasets[0].label=h; 525 options_main_4.data.datasets[0].label=h;
521 options_main_4.data.datasets[0].data=i; 526 options_main_4.data.datasets[0].data=i;
...@@ -539,6 +544,7 @@ function changeLabelText(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r){ ...@@ -539,6 +544,7 @@ function changeLabelText(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r){
539 options_main_nu_4.data.datasets[0].data=q; 544 options_main_nu_4.data.datasets[0].data=q;
540 545
541 menu_name.innerHTML=r; 546 menu_name.innerHTML=r;
547 + box_name.innerHTML=s;
542 options.title.text=r; 548 options.title.text=r;
543 options_stacked.title.text=r; 549 options_stacked.title.text=r;
544 options_main_2.options=options; 550 options_main_2.options=options;
...@@ -551,8 +557,10 @@ function changeLabelText(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r){ ...@@ -551,8 +557,10 @@ function changeLabelText(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r){
551 options_main_nu_stacked.options=options_stacked; 557 options_main_nu_stacked.options=options_stacked;
552 } 558 }
553 559
554 -function changeLabelText2(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r){ 560 +function changeLabelText_hor(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s){
561 + options_main_stacked.type="horizontalBar";
555 options_main_stacked.data.labels=a; 562 options_main_stacked.data.labels=a;
563 + options_main_stacked.data.datasets[0].type="horizontalBar";
556 options_main_stacked.data.datasets[0].label=b; 564 options_main_stacked.data.datasets[0].label=b;
557 options_main_stacked.data.datasets[0].data=c; 565 options_main_stacked.data.datasets[0].data=c;
558 options_main_stacked.data.datasets[1].label=d; 566 options_main_stacked.data.datasets[1].label=d;
...@@ -560,16 +568,20 @@ function changeLabelText2(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r){ ...@@ -560,16 +568,20 @@ function changeLabelText2(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r){
560 options_main_stacked.data.datasets[2].label=f; 568 options_main_stacked.data.datasets[2].label=f;
561 options_main_stacked.data.datasets[2].data=g; 569 options_main_stacked.data.datasets[2].data=g;
562 570
571 + options_main_2.type="horizontalBar";
563 options_main_2.data.labels=h; 572 options_main_2.data.labels=h;
564 options_main_2.data.datasets[0].label=i; 573 options_main_2.data.datasets[0].label=i;
565 options_main_2.data.datasets[0].data=j; 574 options_main_2.data.datasets[0].data=j;
575 + options_main_3.type="horizontalBar";
566 options_main_3.data.labels=k; 576 options_main_3.data.labels=k;
567 options_main_3.data.datasets[0].label=l; 577 options_main_3.data.datasets[0].label=l;
568 options_main_3.data.datasets[0].data=m; 578 options_main_3.data.datasets[0].data=m;
579 + options_main_4.type="horizontalBar";
569 options_main_4.data.labels=n; 580 options_main_4.data.labels=n;
570 options_main_4.data.datasets[0].label=o; 581 options_main_4.data.datasets[0].label=o;
571 options_main_4.data.datasets[0].data=p; 582 options_main_4.data.datasets[0].data=p;
572 583
584 + box_name.innerHTML=s;
573 menu_name.innerHTML=r; 585 menu_name.innerHTML=r;
574 options.title.text=r; 586 options.title.text=r;
575 options_stacked.title.text=r; 587 options_stacked.title.text=r;
...@@ -601,10 +613,11 @@ var analysis1 = document.getElementById('analysis1'); ...@@ -601,10 +613,11 @@ var analysis1 = document.getElementById('analysis1');
601 analysis1.addEventListener('click', function(){ 613 analysis1.addEventListener('click', function(){
602 chartView(); 614 chartView();
603 change_type_title(1); 615 change_type_title(1);
604 - changeLabelText(month_6, "연락 수", logcount_6, "통화 수", callcount_6, "문자 수", smscount_6, "통화 시간", durationsum_6, "누적 연락 수", logcount_6nu, "누적 통화 수", callcount_6nu, "누적 문자 수",smscount_6nu, "누적 통화 시간", durationsum_6nu,"최근 6개월의 통계"); 616 + changeLabelText(month_6, "연락 수", logcount_6, "통화 수", callcount_6, "문자 수", smscount_6, "통화 시간", durationsum_6, "누적 연락 수", logcount_6nu, "누적 통화 수", callcount_6nu, "누적 문자 수",smscount_6nu, "누적 통화 시간", durationsum_6nu,"최근 6개월의 통계","# 연락 수");
605 choosed_menu="analysis1"; 617 choosed_menu="analysis1";
606 - box_name.innerHTML="# 연락 수"
607 window.myChart.destroy(); 618 window.myChart.destroy();
619 + document.getElementById("myChart").height="350";
620 + document.getElementById("chart-area").style="height:380px;";
608 window.myChart = new Chart(ctx, options_main_stacked); 621 window.myChart = new Chart(ctx, options_main_stacked);
609 }); 622 });
610 623
...@@ -612,10 +625,11 @@ var analysis2 = document.getElementById('analysis2'); ...@@ -612,10 +625,11 @@ var analysis2 = document.getElementById('analysis2');
612 analysis2.addEventListener('click', function(){ 625 analysis2.addEventListener('click', function(){
613 chartView(); 626 chartView();
614 change_type_title(1); 627 change_type_title(1);
615 - changeLabelText(month, "연락 수", logcount, "통화 수", callcount, "문자 수", smscount, "통화 시간", durationsum, "누적 연락 수", logcount_nu, "누적 통화 수", callcount_nu, "누적 문자 수",smscount_nu, "누적 통화 시간", durationsum_nu,"전체 기간의 통계"); 628 + changeLabelText(month, "연락 수", logcount, "통화 수", callcount, "문자 수", smscount, "통화 시간", durationsum, "누적 연락 수", logcount_nu, "누적 통화 수", callcount_nu, "누적 문자 수",smscount_nu, "누적 통화 시간", durationsum_nu,"전체 기간의 통계","# 연락 수");
616 choosed_menu="analysis2"; 629 choosed_menu="analysis2";
617 - box_name.innerHTML="# 연락 수"
618 window.myChart.destroy(); 630 window.myChart.destroy();
631 + document.getElementById("myChart").height="350";
632 + document.getElementById("chart-area").style="height:380px;";
619 window.myChart = new Chart(ctx, options_main_stacked); 633 window.myChart = new Chart(ctx, options_main_stacked);
620 }); 634 });
621 635
...@@ -623,10 +637,11 @@ var analysis3 = document.getElementById('analysis3'); ...@@ -623,10 +637,11 @@ var analysis3 = document.getElementById('analysis3');
623 analysis3.addEventListener('click', function(){ 637 analysis3.addEventListener('click', function(){
624 chartView(); 638 chartView();
625 change_type_title(1); 639 change_type_title(1);
626 - changeLabelText(month_b, "연락 수", logcount_b, "통화 수", callcount_b, "문자 수", smscount_b, "통화 시간", durationsum_b, "누적 연락 수", logcount_bnu, "누적 통화 수", callcount_bnu, "누적 문자 수",smscount_bnu, "누적 통화 시간", durationsum_bnu,"특정 기간의 통계"); 640 + changeLabelText(month_b, "연락 수", logcount_b, "통화 수", callcount_b, "문자 수", smscount_b, "통화 시간", durationsum_b, "누적 연락 수", logcount_bnu, "누적 통화 수", callcount_bnu, "누적 문자 수",smscount_bnu, "누적 통화 시간", durationsum_bnu,"특정 기간의 통계 / "+date_start.split(' ')[0]+" ~ "+date_end.split(' ')[0],"# 연락 수");
627 choosed_menu="analysis3"; 641 choosed_menu="analysis3";
628 - box_name.innerHTML="# 연락 수"
629 window.myChart.destroy(); 642 window.myChart.destroy();
643 + document.getElementById("myChart").height="350";
644 + document.getElementById("chart-area").style="height:380px;";
630 window.myChart = new Chart(ctx, options_main_stacked); 645 window.myChart = new Chart(ctx, options_main_stacked);
631 }); 646 });
632 647
...@@ -634,10 +649,11 @@ var analysis4 = document.getElementById('analysis4'); ...@@ -634,10 +649,11 @@ var analysis4 = document.getElementById('analysis4');
634 analysis4.addEventListener('click', function(){ 649 analysis4.addEventListener('click', function(){
635 chartView(); 650 chartView();
636 change_type_title(1); 651 change_type_title(1);
637 - changeLabelText(month_w, "연락 수", logcount_w, "통화 수", callcount_w, "문자 수", smscount_w, "통화 시간", durationsum_w, "누적 연락 수", logcount_wnu, "누적 통화 수", callcount_wnu, "누적 문자 수",smscount_wnu, "누적 통화 시간", durationsum_wnu,"특정 연락처와의 통계"); 652 + changeLabelText(month_w, "연락 수", logcount_w, "통화 수", callcount_w, "문자 수", smscount_w, "통화 시간", durationsum_w, "누적 연락 수", logcount_wnu, "누적 통화 수", callcount_wnu, "누적 문자 수",smscount_wnu, "누적 통화 시간", durationsum_wnu,"특정 연락처와의 통계","# 연락 수");
638 choosed_menu="analysis4"; 653 choosed_menu="analysis4";
639 - box_name.innerHTML="# 연락 수"
640 window.myChart.destroy(); 654 window.myChart.destroy();
655 + document.getElementById("myChart").height="350";
656 + document.getElementById("chart-area").style="height:380px;";
641 window.myChart = new Chart(ctx, options_main_stacked); 657 window.myChart = new Chart(ctx, options_main_stacked);
642 }); 658 });
643 659
...@@ -679,7 +695,7 @@ list4.addEventListener('click', function(){ ...@@ -679,7 +695,7 @@ list4.addEventListener('click', function(){
679 chartspace.style="display:none"; 695 chartspace.style="display:none";
680 choicespace.style="display:none"; 696 choicespace.style="display:none";
681 choosed_menu="list4"; 697 choosed_menu="list4";
682 - menu_name.innerHTML="특정 기간 목록"; 698 + menu_name.innerHTML="특정 기간의 목록 / "+list_date_start.split(' ')[0]+" ~ "+list_date_end.split(' ')[0];
683 window.myChart.destroy(); 699 window.myChart.destroy();
684 }); 700 });
685 701
...@@ -687,10 +703,11 @@ var more1 = document.getElementById('more1'); ...@@ -687,10 +703,11 @@ var more1 = document.getElementById('more1');
687 more1.addEventListener('click', function(){ 703 more1.addEventListener('click', function(){
688 chartView(); 704 chartView();
689 change_type_title(4); 705 change_type_title(4);
690 - changeLabelText2(ranking_rnu, "누적 연락 수", logcount_rnu, "누적 통화 수", callcount_rnu, "누적 문자 수", smscount_rnu, ranking_rnuc, "누적 통화 수", callcount_rnuc, ranking_rnus, "누적 문자 수", smscount_rnus, ranking_rnud, "누적 통화 시간", durationsum_rnud, [],"전체 기간의 연락 순위"); 706 + changeLabelText_hor(ranking_rnu, "누적 연락 수", logcount_rnu, "누적 통화 수", callcount_rnu, "누적 문자 수", smscount_rnu, ranking_rnuc, "누적 통화 수", callcount_rnuc, ranking_rnus, "누적 문자 수", smscount_rnus, ranking_rnud, "누적 통화 시간", durationsum_rnud, [],"전체 기간의 연락 순위","# 연락 수");
691 choosed_menu="more1"; 707 choosed_menu="more1";
692 - box_name.innerHTML="# 연락 수"
693 window.myChart.destroy(); 708 window.myChart.destroy();
709 + document.getElementById("myChart").height="1000";
710 + document.getElementById("chart-area").style="height:1030px;";
694 window.myChart = new Chart(ctx, options_main_stacked); 711 window.myChart = new Chart(ctx, options_main_stacked);
695 }); 712 });
696 713
...@@ -698,10 +715,11 @@ var more2 = document.getElementById('more2'); ...@@ -698,10 +715,11 @@ var more2 = document.getElementById('more2');
698 more2.addEventListener('click', function(){ 715 more2.addEventListener('click', function(){
699 chartView(); 716 chartView();
700 change_type_title(4); 717 change_type_title(4);
701 - changeLabelText2(ranking_brnu, "누적 연락 수", logcount_brnu, "누적 통화 수", callcount_brnu, "누적 문자 수", smscount_brnu, ranking_brnuc, "누적 통화 수", callcount_brnuc, ranking_brnus, "누적 문자 수", smscount_brnus, ranking_brnud, "누적 통화 시간", durationsum_brnud, [],"특정 기간의 연락 순위"); 718 + changeLabelText_hor(ranking_brnu, "누적 연락 수", logcount_brnu, "누적 통화 수", callcount_brnu, "누적 문자 수", smscount_brnu, ranking_brnuc, "누적 통화 수", callcount_brnuc, ranking_brnus, "누적 문자 수", smscount_brnus, ranking_brnud, "누적 통화 시간", durationsum_brnud, [],"특정 기간의 연락 순위 / "+rank_date_start.split(' ')[0]+" ~ "+rank_date_end.split(' ')[0],"# 연락 수");
702 choosed_menu="more2"; 719 choosed_menu="more2";
703 - box_name.innerHTML="# 연락 수"
704 window.myChart.destroy(); 720 window.myChart.destroy();
721 + document.getElementById("myChart").height="1000";
722 + document.getElementById("chart-area").style="height:1030px;";
705 window.myChart = new Chart(ctx, options_main_stacked); 723 window.myChart = new Chart(ctx, options_main_stacked);
706 }); 724 });
707 725
...@@ -709,10 +727,11 @@ var more3 = document.getElementById('more3'); ...@@ -709,10 +727,11 @@ var more3 = document.getElementById('more3');
709 more3.addEventListener('click', function(){ 727 more3.addEventListener('click', function(){
710 chartView(); 728 chartView();
711 change_type_title(5); 729 change_type_title(5);
712 - changeLabelText(timeline, "누적 연락 수", logcount_t, "누적 통화 수", callcount_t, "누적 문자 수", smscount_t, "수", [], "수", [], "수",[] , "수",[], "수", [],"전체 기간의 선호 연락 시간대"); 730 + changeLabelText(timeline, "누적 연락 수", logcount_t, "누적 통화 수", callcount_t, "누적 문자 수", smscount_t, "수", [], "수", [], "수",[] , "수",[], "수", [],"전체 기간의 선호 연락 시간대","# 연락 수");
713 choosed_menu="more3"; 731 choosed_menu="more3";
714 - box_name.innerHTML="# 연락 수"
715 window.myChart.destroy(); 732 window.myChart.destroy();
733 + document.getElementById("myChart").height="350";
734 + document.getElementById("chart-area").style="height:380px;";
716 window.myChart = new Chart(ctx, options_main_stacked); 735 window.myChart = new Chart(ctx, options_main_stacked);
717 }); 736 });
718 737
...@@ -720,10 +739,11 @@ var more4 = document.getElementById('more4'); ...@@ -720,10 +739,11 @@ var more4 = document.getElementById('more4');
720 more4.addEventListener('click', function(){ 739 more4.addEventListener('click', function(){
721 chartView(); 740 chartView();
722 change_type_title(5); 741 change_type_title(5);
723 - changeLabelText(timeline, "누적 연락 수", logcount_tb, "누적 통화 수", callcount_tb, "누적 문자 수", smscount_tb, "수", [], "수", [], "수",[] , "수",[], "수", [],"특정 기간의 선호 연락 시간대"); 742 + changeLabelText(timeline, "누적 연락 수", logcount_tb, "누적 통화 수", callcount_tb, "누적 문자 수", smscount_tb, "수", [], "수", [], "수",[] , "수",[], "수", [],"특정 기간의 선호 연락 시간대 / "+timeline_date_start.split(' ')[0]+" ~ "+timeline_date_end.split(' ')[0],"# 연락 수");
724 choosed_menu="more4"; 743 choosed_menu="more4";
725 - box_name.innerHTML="# 연락 수"
726 window.myChart.destroy(); 744 window.myChart.destroy();
745 + document.getElementById("myChart").height="350";
746 + document.getElementById("chart-area").style="height:380px;";
727 window.myChart = new Chart(ctx, options_main_stacked); 747 window.myChart = new Chart(ctx, options_main_stacked);
728 }); 748 });
729 749
...@@ -731,10 +751,11 @@ var more5 = document.getElementById('more5'); ...@@ -731,10 +751,11 @@ var more5 = document.getElementById('more5');
731 more5.addEventListener('click', function(){ 751 more5.addEventListener('click', function(){
732 chartView(); 752 chartView();
733 change_type_title(5); 753 change_type_title(5);
734 - changeLabelText(timeline, "누적 연락 수", logcount_tw, "누적 통화 수", callcount_tw, "누적 문자 수", smscount_tw, "수", [], "수", [], "수",[] , "수",[], "수", [],"특정 연락처와의 선호 연락 시간대"); 754 + changeLabelText(timeline, "누적 연락 수", logcount_tw, "누적 통화 수", callcount_tw, "누적 문자 수", smscount_tw, "수", [], "수", [], "수",[] , "수",[], "수", [],"특정 연락처와의 선호 연락 시간대","# 연락 수");
735 choosed_menu="more5"; 755 choosed_menu="more5";
736 - box_name.innerHTML="# 연락 수"
737 window.myChart.destroy(); 756 window.myChart.destroy();
757 + document.getElementById("myChart").height="350";
758 + document.getElementById("chart-area").style="height:380px;";
738 window.myChart = new Chart(ctx, options_main_stacked); 759 window.myChart = new Chart(ctx, options_main_stacked);
739 }); 760 });
740 761
...@@ -869,13 +890,14 @@ type8.addEventListener('click', function(){ ...@@ -869,13 +890,14 @@ type8.addEventListener('click', function(){
869 890
870 891
871 function get_date_analysis(){ 892 function get_date_analysis(){
872 - chartView();
873 - change_type_title(1);
874 - choosed_menu="analysis3";
875 893
876 date_start=document.getElementById('between_date_start').value+' 00:00:00'; 894 date_start=document.getElementById('between_date_start').value+' 00:00:00';
877 date_end=document.getElementById('between_date_end').value+' 23:59:59'; 895 date_end=document.getElementById('between_date_end').value+' 23:59:59';
878 896
897 + chartView();
898 + change_type_title(1);
899 + choosed_menu="analysis3";
900 +
879 connection.query('drop table IF EXISTS calllog_between; create table calllog_between(date datetime not null, logcount int, callcount int, smscount int, durationsum int, primary key(date)); insert into calllog_between(date, callcount, durationsum) (select date_format(date, "%Y-%m-02 00:00:00"), count(*), sum(duration) from calllog where type in (1,2,3) and date between ? and ? group by date_format(date, "%Y-%m-02 00:00:00")); update calllog_between cb left join (select date_format(date, "%Y-%m-02 00:00:00") "date", count(*) "count" from calllog where date between ? and ? group by date_format(date, "%Y-%m-02 00:00:00")) temp on cb.date=temp.date set cb.logcount=temp.count, cb.smscount=cb.logcount-cb.callcount;',[date_start, date_end,date_start, date_end], function(err, rows){ 901 connection.query('drop table IF EXISTS calllog_between; create table calllog_between(date datetime not null, logcount int, callcount int, smscount int, durationsum int, primary key(date)); insert into calllog_between(date, callcount, durationsum) (select date_format(date, "%Y-%m-02 00:00:00"), count(*), sum(duration) from calllog where type in (1,2,3) and date between ? and ? group by date_format(date, "%Y-%m-02 00:00:00")); update calllog_between cb left join (select date_format(date, "%Y-%m-02 00:00:00") "date", count(*) "count" from calllog where date between ? and ? group by date_format(date, "%Y-%m-02 00:00:00")) temp on cb.date=temp.date set cb.logcount=temp.count, cb.smscount=cb.logcount-cb.callcount;',[date_start, date_end,date_start, date_end], function(err, rows){
880 if(!err){ 902 if(!err){
881 connection.query('select * from calllog_between order by date;', function(err, rows, fields){ 903 connection.query('select * from calllog_between order by date;', function(err, rows, fields){
...@@ -910,6 +932,12 @@ function get_date_analysis(){ ...@@ -910,6 +932,12 @@ function get_date_analysis(){
910 smscount_bnu.push(rows[i].smscount); 932 smscount_bnu.push(rows[i].smscount);
911 durationsum_bnu.push(rows[i].durationsum); 933 durationsum_bnu.push(rows[i].durationsum);
912 } 934 }
935 +
936 + changeLabelText(month_b, "연락 수", logcount_b, "통화 수", callcount_b, "문자 수", smscount_b, "통화 시간", durationsum_b, "누적 연락 수", logcount_bnu, "누적 통화 수", callcount_bnu, "누적 문자 수",smscount_bnu, "누적 통화 시간", durationsum_bnu,"특정 기간의 통계 / "+date_start.split(' ')[0]+" ~ "+date_end.split(' ')[0],"# 연락 수");
937 + window.myChart.destroy();
938 + document.getElementById("myChart").height="350";
939 + document.getElementById("chart-area").style="height:380px;";
940 + window.myChart = new Chart(ctx, options_main_stacked);
913 } 941 }
914 else 942 else
915 cc.innerHTML='Error-#15'; 943 cc.innerHTML='Error-#15';
...@@ -918,21 +946,16 @@ function get_date_analysis(){ ...@@ -918,21 +946,16 @@ function get_date_analysis(){
918 else 946 else
919 cc.innerHTML='Error-#13'+err; 947 cc.innerHTML='Error-#13'+err;
920 }); 948 });
921 -
922 - menu_name.innerHTML="특정 기간의 통계";
923 - changeLabelText(month_b, "연락 수", logcount_b, "통화 수", callcount_b, "문자 수", smscount_b, "통화 시간", durationsum_b, "누적 연락 수", logcount_bnu, "누적 통화 수", callcount_bnu, "누적 문자 수",smscount_bnu, "누적 통화 시간", durationsum_bnu,"특정 기간의 통계");
924 - window.myChart.destroy();
925 -
926 //connection.end(); 949 //connection.end();
927 } 950 }
928 951
929 function get_number_push(){ 952 function get_number_push(){
930 number.push(document.getElementById('number').value); 953 number.push(document.getElementById('number').value);
931 - analysis4_list.innerHTML=number; 954 + analysis4_list.innerHTML=number.join('<br>');
932 } 955 }
933 function get_number_pop(){ 956 function get_number_pop(){
934 number.splice(number.indexOf(document.getElementById('number').value),1); 957 number.splice(number.indexOf(document.getElementById('number').value),1);
935 - analysis4_list.innerHTML=number; 958 + analysis4_list.innerHTML=number.join('<br>');
936 } 959 }
937 function get_number_analysis(){ 960 function get_number_analysis(){
938 chartView(); 961 chartView();
...@@ -973,6 +996,11 @@ function get_number_analysis(){ ...@@ -973,6 +996,11 @@ function get_number_analysis(){
973 smscount_wnu.push(rows[i].smscount); 996 smscount_wnu.push(rows[i].smscount);
974 durationsum_wnu.push(rows[i].durationsum); 997 durationsum_wnu.push(rows[i].durationsum);
975 } 998 }
999 + changeLabelText(month_w, "연락 수", logcount_w, "통화 수", callcount_w, "문자 수", smscount_w, "통화 시간", durationsum_w, "누적 연락 수", logcount_wnu, "누적 통화 수", callcount_wnu, "누적 문자 수",smscount_wnu, "누적 통화 시간", durationsum_wnu,"특정 연락처와의 통계","# 연락 수");
1000 + window.myChart.destroy();
1001 + document.getElementById("myChart").height="350";
1002 + document.getElementById("chart-area").style="height:380px;";
1003 + window.myChart = new Chart(ctx, options_main_stacked);
976 } 1004 }
977 else 1005 else
978 cc.innerHTML='Error-#18'; 1006 cc.innerHTML='Error-#18';
...@@ -981,10 +1009,6 @@ function get_number_analysis(){ ...@@ -981,10 +1009,6 @@ function get_number_analysis(){
981 else 1009 else
982 cc.innerHTML='Error-#16'+err; 1010 cc.innerHTML='Error-#16'+err;
983 }); 1011 });
984 -
985 - menu_name.innerHTML="특정 연락처와의 통계";
986 - changeLabelText(month_w, "연락 수", logcount_w, "통화 수", callcount_w, "문자 수", smscount_w, "통화 시간", durationsum_w, "누적 연락 수", logcount_wnu, "누적 통화 수", callcount_wnu, "누적 문자 수",smscount_wnu, "누적 통화 시간", durationsum_wnu,"특정 연락처와의 통계");
987 - window.myChart.destroy();
988 //connection.end(); 1012 //connection.end();
989 } 1013 }
990 1014
...@@ -1071,15 +1095,17 @@ function get_date_rank(){ ...@@ -1071,15 +1095,17 @@ function get_date_rank(){
1071 ranking_brnud.push(rows[i].number+" ("+name+")"); 1095 ranking_brnud.push(rows[i].number+" ("+name+")");
1072 durationsum_brnud.push(rows[i].durationsum); 1096 durationsum_brnud.push(rows[i].durationsum);
1073 } 1097 }
1098 + changeLabelText_hor(ranking_brnu, "누적 연락 수", logcount_brnu, "누적 통화 수", callcount_brnu, "누적 문자 수", smscount_brnu, ranking_brnuc, "누적 통화 수", callcount_brnuc, ranking_brnus, "누적 문자 수", smscount_brnus, ranking_brnud, "누적 통화 시간", durationsum_brnud, [],"특정 기간의 연락 순위 / "+rank_date_start.split(' ')[0]+" ~ "+rank_date_end.split(' ')[0],"# 연락 수");
1099 + window.myChart.destroy();
1100 + document.getElementById("myChart").height="1000";
1101 + document.getElementById("chart-area").style="height:1030px;";
1102 + window.myChart = new Chart(ctx, options_main_stacked);
1074 } 1103 }
1075 else 1104 else
1076 cc.innerHTML='Error-#23'; 1105 cc.innerHTML='Error-#23';
1077 }); 1106 });
1078 } 1107 }
1079 }) 1108 })
1080 - menu_name.innerHTML="특정 기간의 연락 순위";
1081 - changeLabelText2(ranking_brnu, "누적 연락 수", logcount_brnu, "누적 통화 수", callcount_brnu, "누적 문자 수", smscount_brnu, ranking_brnuc, "누적 통화 수", callcount_brnuc, ranking_brnus, "누적 문자 수", smscount_brnus, ranking_brnud, "누적 통화 시간", durationsum_brnud, [],"특정 기간의 연락 순위");
1082 - window.myChart.destroy();
1083 //connection.end(); 1109 //connection.end();
1084 } 1110 }
1085 1111
...@@ -1104,6 +1130,11 @@ function get_date_timeline(){ ...@@ -1104,6 +1130,11 @@ function get_date_timeline(){
1104 smscount_tb.push(rows[i].smscount); 1130 smscount_tb.push(rows[i].smscount);
1105 logcount_tb.push(rows[i].callcount+rows[i].smscount); 1131 logcount_tb.push(rows[i].callcount+rows[i].smscount);
1106 } 1132 }
1133 + changeLabelText(timeline, "누적 연락 수", logcount_tb, "누적 통화 수", callcount_tb, "누적 문자 수", smscount_tb, "수", [], "수", [], "수",[] , "수",[], "수", [],"특정 기간의 선호 연락 시간대 / "+timeline_date_start.split(' ')[0]+" ~ "+timeline_date_end.split(' ')[0],"# 연락 수");
1134 + window.myChart.destroy();
1135 + document.getElementById("myChart").height="350";
1136 + document.getElementById("chart-area").style="height:380px;";
1137 + window.myChart = new Chart(ctx, options_main_stacked);
1107 } 1138 }
1108 else 1139 else
1109 cc.innerHTML='Error-#25'; 1140 cc.innerHTML='Error-#25';
...@@ -1112,20 +1143,16 @@ function get_date_timeline(){ ...@@ -1112,20 +1143,16 @@ function get_date_timeline(){
1112 else 1143 else
1113 cc.innerHTML='Error-#24'+err; 1144 cc.innerHTML='Error-#24'+err;
1114 }); 1145 });
1115 -
1116 - menu_name.innerHTML="특정 기간의 선호 연락 시간대";
1117 - changeLabelText(timeline, "누적 연락 수", logcount_tb, "누적 통화 수", callcount_tb, "누적 문자 수", smscount_tb, "수", [], "수", [], "수",[] , "수",[], "수", [],"특정 기간의 선호 연락 시간대");
1118 - window.myChart.destroy();
1119 //connection.end(); 1146 //connection.end();
1120 } 1147 }
1121 1148
1122 function get_number_timeline_push(){ 1149 function get_number_timeline_push(){
1123 timeline_number.push(document.getElementById('timeline_number').value); 1150 timeline_number.push(document.getElementById('timeline_number').value);
1124 - more5_list.innerHTML=timeline_number; 1151 + more5_list.innerHTML=timeline_number.join('<br>');
1125 } 1152 }
1126 function get_number_timeline_pop(){ 1153 function get_number_timeline_pop(){
1127 timeline_number.splice(timeline_number.indexOf(document.getElementById('timeline_number').value),1); 1154 timeline_number.splice(timeline_number.indexOf(document.getElementById('timeline_number').value),1);
1128 - more5_list.innerHTML=timeline_number; 1155 + more5_list.innerHTML=timeline_number.join('<br>');
1129 } 1156 }
1130 function get_number_timeline(){ 1157 function get_number_timeline(){
1131 chartView(); 1158 chartView();
...@@ -1145,6 +1172,11 @@ function get_number_timeline(){ ...@@ -1145,6 +1172,11 @@ function get_number_timeline(){
1145 smscount_tw.push(rows[i].smscount); 1172 smscount_tw.push(rows[i].smscount);
1146 logcount_tw.push(rows[i].callcount+rows[i].smscount); 1173 logcount_tw.push(rows[i].callcount+rows[i].smscount);
1147 } 1174 }
1175 + changeLabelText(timeline, "누적 연락 수", logcount_tw, "누적 통화 수", callcount_tw, "누적 문자 수", smscount_tw, "수", [], "수", [], "수",[] , "수",[], "수", [],"특정 연락처와의 선호 연락 시간대","# 연락 수");
1176 + window.myChart.destroy();
1177 + document.getElementById("myChart").height="350";
1178 + document.getElementById("chart-area").style="height:380px;";
1179 + window.myChart = new Chart(ctx, options_main_stacked);
1148 } 1180 }
1149 else 1181 else
1150 cc.innerHTML='Error-#27'; 1182 cc.innerHTML='Error-#27';
...@@ -1153,10 +1185,6 @@ function get_number_timeline(){ ...@@ -1153,10 +1185,6 @@ function get_number_timeline(){
1153 else 1185 else
1154 cc.innerHTML='Error-#26'+err; 1186 cc.innerHTML='Error-#26'+err;
1155 }); 1187 });
1156 -
1157 - menu_name.innerHTML="특정 연락처와의 선호 연락 시간대";
1158 - changeLabelText(timeline, "누적 연락 수", logcount_tw, "누적 통화 수", callcount_tw, "누적 문자 수", smscount_tw, "수", [], "수", [], "수",[] , "수",[], "수", [],"특정 연락처와의 선호 연락 시간대");
1159 - window.myChart.destroy();
1160 //connection.end(); 1188 //connection.end();
1161 } 1189 }
1162 1190
...@@ -1486,7 +1514,7 @@ function get_date_list(){ ...@@ -1486,7 +1514,7 @@ function get_date_list(){
1486 } 1514 }
1487 values_list_between.push({type:type_temp, type_cs:type_cs_temp ,type_gs:type_gs_temp,number:number_temp,date:date_temp, body:body_temp, duration:duration_temp, delete:delete_temp}); 1515 values_list_between.push({type:type_temp, type_cs:type_cs_temp ,type_gs:type_gs_temp,number:number_temp,date:date_temp, body:body_temp, duration:duration_temp, delete:delete_temp});
1488 } 1516 }
1489 - menu_name.innerHTML="특정 기간의 목록"; 1517 + menu_name.innerHTML="특정 기간의 목록 / "+list_date_start.split(' ')[0]+" ~ "+list_date_end.split(' ')[0];
1490 myList3 = new List('listspace3', options_list, values_list_between); 1518 myList3 = new List('listspace3', options_list, values_list_between);
1491 } 1519 }
1492 else 1520 else
...@@ -1505,22 +1533,25 @@ var filter3_element=document.getElementsByClassName("filter3"); ...@@ -1505,22 +1533,25 @@ var filter3_element=document.getElementsByClassName("filter3");
1505 function filter_listener(event){ 1533 function filter_listener(event){
1506 var data_filter_temp=event.target.getAttribute('data_filter'); 1534 var data_filter_temp=event.target.getAttribute('data_filter');
1507 var data_value_temp=event.target.getAttribute('data_value'); 1535 var data_value_temp=event.target.getAttribute('data_value');
1536 + var icon_temp=event.target.getAttribute('icon');
1508 var checked_temp=event.target.checked; 1537 var checked_temp=event.target.checked;
1509 1538
1510 - switch(event.target.id){ 1539 + switch(event.target.id.slice(0,7)){
1511 case "filter1": 1540 case "filter1":
1512 - filter_action(filter1List, checked_temp, data_filter_temp, data_value_temp, myList); 1541 + filter_action(filter1List, checked_temp, data_filter_temp, data_value_temp, icon_temp, myList);
1513 break; 1542 break;
1514 case "filter2": 1543 case "filter2":
1515 - filter_action(filter2List, checked_temp, data_filter_temp, data_value_temp, myList2); 1544 + filter_action(filter2List, checked_temp, data_filter_temp, data_value_temp, icon_temp, myList2);
1516 break; 1545 break;
1517 case "filter3": 1546 case "filter3":
1518 - filter_action(filter3List, checked_temp, data_filter_temp, data_value_temp, myList3); 1547 + filter_action(filter3List, checked_temp, data_filter_temp, data_value_temp, icon_temp, myList3);
1519 break; 1548 break;
1520 } 1549 }
1521 } 1550 }
1522 -function filter_action(paramlist, checked_temp, filter_temp, value_temp, myList_temp){ 1551 +function filter_action(paramlist, checked_temp, filter_temp, value_temp, icon_temp, myList_temp){
1523 if (checked_temp){ 1552 if (checked_temp){
1553 + document.getElementById(icon_temp).style="display:inline";
1554 +
1524 paramlist.push(filter_temp); 1555 paramlist.push(filter_temp);
1525 paramlist.push(value_temp); 1556 paramlist.push(value_temp);
1526 1557
...@@ -1537,6 +1568,8 @@ function filter_action(paramlist, checked_temp, filter_temp, value_temp, myList_ ...@@ -1537,6 +1568,8 @@ function filter_action(paramlist, checked_temp, filter_temp, value_temp, myList_
1537 }); 1568 });
1538 } 1569 }
1539 else{ 1570 else{
1571 + document.getElementById(icon_temp).style="display:none";
1572 +
1540 paramlist.splice(paramlist.indexOf(value_temp)-1,2); 1573 paramlist.splice(paramlist.indexOf(value_temp)-1,2);
1541 1574
1542 myList_temp.filter(function (item) { 1575 myList_temp.filter(function (item) {
...@@ -1643,11 +1676,11 @@ connection.query('drop table if exists sms_response; create table sms_response ( ...@@ -1643,11 +1676,11 @@ connection.query('drop table if exists sms_response; create table sms_response (
1643 1676
1644 function get_number_restime_push(){ 1677 function get_number_restime_push(){
1645 restime_number.push(document.getElementById('restime_number').value); 1678 restime_number.push(document.getElementById('restime_number').value);
1646 - more7_list.innerHTML=restime_number; 1679 + more7_list.innerHTML=restime_number.join('<br>');
1647 } 1680 }
1648 function get_number_restime_pop(){ 1681 function get_number_restime_pop(){
1649 restime_number.splice(restime_number.indexOf(document.getElementById('restime_number').value),1); 1682 restime_number.splice(restime_number.indexOf(document.getElementById('restime_number').value),1);
1650 - more7_list.innerHTML=restime_number; 1683 + more7_list.innerHTML=restime_number.join('<br>');
1651 } 1684 }
1652 function get_number_restime(){ 1685 function get_number_restime(){
1653 listspace.style="display:none"; 1686 listspace.style="display:none";
......
...@@ -30,56 +30,81 @@ ...@@ -30,56 +30,81 @@
30 30
31 <!-- Heading --> 31 <!-- Heading -->
32 <div class="sidebar-heading"> 32 <div class="sidebar-heading">
33 - 키워드 분석 33 + <svg class="bi bi-envelope menu_icon" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
34 + <path fill-rule="evenodd" d="M14 3H2a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1zM2 2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H2z"/>
35 + <path d="M.05 3.555C.017 3.698 0 3.847 0 4v.697l5.803 3.546L0 11.801V12c0 .306.069.596.192.856l6.57-4.027L8 9.586l1.239-.757 6.57 4.027c.122-.26.191-.55.191-.856v-.2l-5.803-3.557L16 4.697V4c0-.153-.017-.302-.05-.445L8 8.414.05 3.555z"/>
36 + </svg>
37 + 문자 키워드 분석
34 </div> 38 </div>
35 39
36 <!-- Nav Item - Dashboard --> 40 <!-- Nav Item - Dashboard -->
37 <li class="nav-item active"> 41 <li class="nav-item active">
38 <a class="nav-link" id="keyword" style="text-decoration:line-through"> 42 <a class="nav-link" id="keyword" style="text-decoration:line-through">
39 - <i class="fas fa-fw"></i> 43 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
44 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
45 + </svg>
40 <span>전체 문자 키워드 목록</span></a> 46 <span>전체 문자 키워드 목록</span></a>
41 </li> 47 </li>
42 48
43 <!-- Nav Item - Dashboard --> 49 <!-- Nav Item - Dashboard -->
44 <li class="nav-item active"> 50 <li class="nav-item active">
45 <a class="nav-link" id="keyword1" style="text-decoration:line-through"> 51 <a class="nav-link" id="keyword1" style="text-decoration:line-through">
46 - <i class="fas fa-fw"></i> 52 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
53 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
54 + </svg>
47 <span>최근 키워드 순위</span></a> 55 <span>최근 키워드 순위</span></a>
48 </li> 56 </li>
49 57
50 <!-- Nav Item - Dashboard --> 58 <!-- Nav Item - Dashboard -->
51 <li class="nav-item active"> 59 <li class="nav-item active">
52 <a class="nav-link" id="keyword2" style="text-decoration:line-through"> 60 <a class="nav-link" id="keyword2" style="text-decoration:line-through">
53 - <i class="fas fa-fw"></i> 61 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
62 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
63 + </svg>
54 <span>전체 키워드 순위</span></a> 64 <span>전체 키워드 순위</span></a>
55 </li> 65 </li>
56 66
57 <!-- Nav Item - Dashboard --> 67 <!-- Nav Item - Dashboard -->
58 <li class="nav-item active"> 68 <li class="nav-item active">
59 <a class="nav-link" id="keyword3" style="text-decoration:line-through"> 69 <a class="nav-link" id="keyword3" style="text-decoration:line-through">
60 - <i class="fas fa-fw"></i> 70 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
61 - <span>특정 기간 키워드</span></a> 71 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
72 + </svg>
73 + <span>특정 기간 키워드 순위</span></a>
62 </li> 74 </li>
63 75
64 - <form name="dateForm" method="post" id="dateForm"> 76 + <form name="dateForm" method="post" id="dateForm" style="color:white;">
65 <input type="date" id="between_date_start" /> 77 <input type="date" id="between_date_start" />
66 ~ 78 ~
67 <input type="date" id="between_date_end" /> 79 <input type="date" id="between_date_end" />
68 - <input type="button" id="between_date_submit" value="》" onclick="get_date_keyword();" /> 80 + <svg class="bi bi-arrow-right-short" id="between_date_submit" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_date_keyword();">
81 + <path fill-rule="evenodd" d="M8.146 4.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.793 8 8.146 5.354a.5.5 0 0 1 0-.708z"/>
82 + <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5H11a.5.5 0 0 1 0 1H4.5A.5.5 0 0 1 4 8z"/>
83 + </svg>
69 </form> 84 </form>
70 85
71 <!-- Nav Item - Dashboard --> 86 <!-- Nav Item - Dashboard -->
72 <li class="nav-item active"> 87 <li class="nav-item active">
73 <a class="nav-link" id="keyword4" style="text-decoration:line-through"> 88 <a class="nav-link" id="keyword4" style="text-decoration:line-through">
74 - <i class="fas fa-fw"></i> 89 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
75 - <span>특정 연락처 키워드</span></a> 90 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
91 + </svg>
92 + <span>특정 연락처 키워드 순위</span></a>
76 </li> 93 </li>
77 94
78 <form name="numberForm" method="post" id="numberForm"> 95 <form name="numberForm" method="post" id="numberForm">
79 <input type="text" id="number" /> 96 <input type="text" id="number" />
80 - <input type="button" id="number_push" value="+" onclick="get_number_push();" /> 97 + <svg class="bi bi-plus" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_number_push();">
81 - <input type="button" id="number_pop" value="-" onclick="get_number_pop();" /> 98 + <path fill-rule="evenodd" d="M8 3.5a.5.5 0 0 1 .5.5v4a.5.5 0 0 1-.5.5H4a.5.5 0 0 1 0-1h3.5V4a.5.5 0 0 1 .5-.5z"/>
82 - <input type="button" id="number_submit" value="》" onclick="get_number_keyword();" /> 99 + <path fill-rule="evenodd" d="M7.5 8a.5.5 0 0 1 .5-.5h4a.5.5 0 0 1 0 1H8.5V12a.5.5 0 0 1-1 0V8z"/>
100 + </svg>
101 + <svg class="bi bi-dash" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_number_pop();">
102 + <path fill-rule="evenodd" d="M3.5 8a.5.5 0 0 1 .5-.5h8a.5.5 0 0 1 0 1H4a.5.5 0 0 1-.5-.5z"/>
103 + </svg>
104 + <svg class="bi bi-arrow-right-short" id="number_submit" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white; margin-top:6px;" onclick="get_number_keyword();">
105 + <path fill-rule="evenodd" d="M8.146 4.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.793 8 8.146 5.354a.5.5 0 0 1 0-.708z"/>
106 + <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5H11a.5.5 0 0 1 0 1H4.5A.5.5 0 0 1 4 8z"/>
107 + </svg>
83 </form> 108 </form>
84 <li class="nav-item active" id="keyword4_list"></li> 109 <li class="nav-item active" id="keyword4_list"></li>
85 110
...@@ -88,97 +113,163 @@ ...@@ -88,97 +113,163 @@
88 113
89 <!-- Heading --> 114 <!-- Heading -->
90 <div class="sidebar-heading"> 115 <div class="sidebar-heading">
116 + <svg class="bi bi-credit-card menu_icon" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
117 + <path fill-rule="evenodd" d="M14 3H2a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1zM2 2a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V4a2 2 0 0 0-2-2H2z"/>
118 + <rect width="3" height="3" x="2" y="9" rx="1"/>
119 + <path d="M1 5h14v2H1z"/>
120 + </svg>
91 결제문자 분석 121 결제문자 분석
92 </div> 122 </div>
93 123
94 <!-- Nav Item - Dashboard --> 124 <!-- Nav Item - Dashboard -->
95 <li class="nav-item active"> 125 <li class="nav-item active">
96 - <a class="nav-link" id="payment1"> 126 + <a class="nav-link" id="payment0">
97 - <i class="fas fa-fw"></i> 127 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
128 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
129 + </svg>
98 <span>결제문자 목록</span></a> 130 <span>결제문자 목록</span></a>
99 </li> 131 </li>
100 132
101 <!-- Nav Item - Dashboard --> 133 <!-- Nav Item - Dashboard -->
102 <li class="nav-item active"> 134 <li class="nav-item active">
135 + <a class="nav-link" id="payment1">
136 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
137 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
138 + </svg>
139 + <span>특정 기간 결제문자 목록</span></a>
140 + </li>
141 +
142 + <form name="dateForm" method="post" id="dateForm" style="color:white;">
143 + <input type="date" id="between_paylist_date_start" />
144 + ~
145 + <input type="date" id="between_paylist_date_end" />
146 + <svg class="bi bi-arrow-right-short" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;margin-top:6px;" onclick="get_paylist_date_payment();">
147 + <path fill-rule="evenodd" d="M8.146 4.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.793 8 8.146 5.354a.5.5 0 0 1 0-.708z"/>
148 + <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5H11a.5.5 0 0 1 0 1H4.5A.5.5 0 0 1 4 8z"/>
149 + </svg>
150 + </form>
151 +
152 + <!-- Divider -->
153 + <hr class="sidebar-divider2">
154 +
155 + <!-- Nav Item - Dashboard -->
156 + <li class="nav-item active">
103 <a class="nav-link" id="payment2"> 157 <a class="nav-link" id="payment2">
104 - <i class="fas fa-fw"></i> 158 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
105 - <span>전체 사용 금액 통계</span></a> 159 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
160 + </svg>
161 + <span>전체 결제 금액 통계</span></a>
106 </li> 162 </li>
107 163
108 <!-- Nav Item - Dashboard --> 164 <!-- Nav Item - Dashboard -->
109 <li class="nav-item active"> 165 <li class="nav-item active">
110 <a class="nav-link" id="payment3"> 166 <a class="nav-link" id="payment3">
111 - <i class="fas fa-fw"></i> 167 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
112 - <span>특정 기간 사용 금액 통계</span></a> 168 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
169 + </svg>
170 + <span>특정 기간 결제 금액 통계</span></a>
113 </li> 171 </li>
114 172
115 - <form name="dateForm" method="post" id="dateForm"> 173 + <form name="dateForm" method="post" id="dateForm" style="color:white;">
116 <input type="date" id="between_amount_date_start" /> 174 <input type="date" id="between_amount_date_start" />
117 ~ 175 ~
118 <input type="date" id="between_amount_date_end" /> 176 <input type="date" id="between_amount_date_end" />
119 - <input type="button" id="between_amount_date_submit" value="》" onclick="get_amount_date_payment();" /> 177 + <svg class="bi bi-arrow-right-short" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;margin-top:6px;" onclick="get_amount_date_payment();">
178 + <path fill-rule="evenodd" d="M8.146 4.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.793 8 8.146 5.354a.5.5 0 0 1 0-.708z"/>
179 + <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5H11a.5.5 0 0 1 0 1H4.5A.5.5 0 0 1 4 8z"/>
180 + </svg>
120 </form> 181 </form>
121 182
183 + <!-- Divider -->
184 + <hr class="sidebar-divider2">
185 +
122 <!-- Nav Item - Dashboard --> 186 <!-- Nav Item - Dashboard -->
123 <li class="nav-item active"> 187 <li class="nav-item active">
124 <a class="nav-link" id="payment4"> 188 <a class="nav-link" id="payment4">
125 - <i class="fas fa-fw"></i> 189 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
190 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
191 + </svg>
126 <span>결제 시간대</span></a> 192 <span>결제 시간대</span></a>
127 </li> 193 </li>
128 194
129 <!-- Nav Item - Dashboard --> 195 <!-- Nav Item - Dashboard -->
130 <li class="nav-item active"> 196 <li class="nav-item active">
131 <a class="nav-link" id="payment5"> 197 <a class="nav-link" id="payment5">
132 - <i class="fas fa-fw"></i> 198 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
199 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
200 + </svg>
133 <span>특정 기간 결제 시간대</span></a> 201 <span>특정 기간 결제 시간대</span></a>
134 </li> 202 </li>
135 203
136 - <form name="dateForm" method="post" id="dateForm"> 204 + <form name="dateForm" method="post" id="dateForm" style="color:white;">
137 <input type="date" id="between_payment_date_start" /> 205 <input type="date" id="between_payment_date_start" />
138 ~ 206 ~
139 <input type="date" id="between_payment_date_end" /> 207 <input type="date" id="between_payment_date_end" />
140 - <input type="button" id="between_payment_date_submit" value="》" onclick="get_payment_date_payment();" /> 208 + <svg class="bi bi-arrow-right-short" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;margin-top:6px;" onclick="get_payment_date_payment();">
209 + <path fill-rule="evenodd" d="M8.146 4.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.793 8 8.146 5.354a.5.5 0 0 1 0-.708z"/>
210 + <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5H11a.5.5 0 0 1 0 1H4.5A.5.5 0 0 1 4 8z"/>
211 + </svg>
141 </form> 212 </form>
142 213
214 + <!-- Divider -->
215 + <hr class="sidebar-divider2">
216 +
143 <!-- Nav Item - Dashboard --> 217 <!-- Nav Item - Dashboard -->
144 <li class="nav-item active"> 218 <li class="nav-item active">
145 <a class="nav-link" id="payment6"> 219 <a class="nav-link" id="payment6">
146 - <i class="fas fa-fw"></i> 220 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
221 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
222 + </svg>
147 <span>카드 이용 순위</span></a> 223 <span>카드 이용 순위</span></a>
148 </li> 224 </li>
149 225
150 <!-- Nav Item - Dashboard --> 226 <!-- Nav Item - Dashboard -->
151 <li class="nav-item active"> 227 <li class="nav-item active">
152 <a class="nav-link" id="payment7"> 228 <a class="nav-link" id="payment7">
153 - <i class="fas fa-fw"></i> 229 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
230 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
231 + </svg>
154 <span>특정 기간 카드 이용 순위</span></a> 232 <span>특정 기간 카드 이용 순위</span></a>
155 </li> 233 </li>
156 234
157 - <form name="dateForm" method="post" id="dateForm"> 235 + <form name="dateForm" method="post" id="dateForm" style="color:white;">
158 <input type="date" id="between_card_date_start" /> 236 <input type="date" id="between_card_date_start" />
159 ~ 237 ~
160 <input type="date" id="between_card_date_end" /> 238 <input type="date" id="between_card_date_end" />
161 - <input type="button" id="between_card_date_submit" value="》" onclick="get_card_date_payment();" /> 239 + <svg class="bi bi-arrow-right-short" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;margin-top:6px;" onclick="get_card_date_payment();">
240 + <path fill-rule="evenodd" d="M8.146 4.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.793 8 8.146 5.354a.5.5 0 0 1 0-.708z"/>
241 + <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5H11a.5.5 0 0 1 0 1H4.5A.5.5 0 0 1 4 8z"/>
242 + </svg>
162 </form> 243 </form>
163 244
245 + <!-- Divider -->
246 + <hr class="sidebar-divider2">
247 +
164 <!-- Nav Item - Dashboard --> 248 <!-- Nav Item - Dashboard -->
165 <li class="nav-item active"> 249 <li class="nav-item active">
166 <a class="nav-link" id="payment8"> 250 <a class="nav-link" id="payment8">
167 - <i class="fas fa-fw"></i> 251 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
252 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
253 + </svg>
168 <span>사용처 순위</span></a> 254 <span>사용처 순위</span></a>
169 </li> 255 </li>
170 256
171 <!-- Nav Item - Dashboard --> 257 <!-- Nav Item - Dashboard -->
172 <li class="nav-item active"> 258 <li class="nav-item active">
173 <a class="nav-link" id="payment9"> 259 <a class="nav-link" id="payment9">
174 - <i class="fas fa-fw"></i> 260 + <svg class="bi bi-dot" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;">
261 + <path fill-rule="evenodd" d="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
262 + </svg>
175 <span>특정 기간 사용처 순위</span></a> 263 <span>특정 기간 사용처 순위</span></a>
176 </li> 264 </li>
177 - <form name="dateForm" method="post" id="dateForm"> 265 + <form name="dateForm" method="post" id="dateForm" style="color:white; margin-bottom:7rem;">
178 <input type="date" id="between_store_date_start" /> 266 <input type="date" id="between_store_date_start" />
179 ~ 267 ~
180 <input type="date" id="between_store_date_end" /> 268 <input type="date" id="between_store_date_end" />
181 - <input type="button" id="between_store_date_submit" value="》" onclick="get_store_date_payment();" /> 269 + <svg class="bi bi-arrow-right-short" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="color:white;margin-top:6px;" onclick="get_store_date_payment();">
270 + <path fill-rule="evenodd" d="M8.146 4.646a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.793 8 8.146 5.354a.5.5 0 0 1 0-.708z"/>
271 + <path fill-rule="evenodd" d="M4 8a.5.5 0 0 1 .5-.5H11a.5.5 0 0 1 0 1H4.5A.5.5 0 0 1 4 8z"/>
272 + </svg>
182 </form> 273 </form>
183 </ul> 274 </ul>
184 <!-- End of Sidebar --> 275 <!-- End of Sidebar -->
...@@ -200,6 +291,7 @@ ...@@ -200,6 +291,7 @@
200 <div class="row"> 291 <div class="row">
201 <div id="choice" style="display:none;"> 292 <div id="choice" style="display:none;">
202 <ul id="choiceul"> 293 <ul id="choiceul">
294 + <li class="cr" id="type0"></li>
203 <li class="cr" id="type1"></li> 295 <li class="cr" id="type1"></li>
204 <li class="cr" id="type2"></li> 296 <li class="cr" id="type2"></li>
205 </ul> 297 </ul>
...@@ -230,8 +322,8 @@ ...@@ -230,8 +322,8 @@
230 </div> 322 </div>
231 <!-- Card Body --> 323 <!-- Card Body -->
232 <div class="card-body"> 324 <div class="card-body">
233 - <div class="chart-area"> 325 + <div class="chart-area" id="chart-area">
234 - <canvas id="myChart" width="710" height="350" style="margin-left:4px; margin-top:4px;"></canvas> 326 + <canvas id="myChart" width="700" style="margin-left:4px; margin-top:4px;"></canvas>
235 </div> 327 </div>
236 </div> 328 </div>
237 </div> 329 </div>
...@@ -248,11 +340,19 @@ ...@@ -248,11 +340,19 @@
248 </form> 340 </form>
249 <div id="myList_in"> 341 <div id="myList_in">
250 <li class="sort" data-sort="date"># 시간순</li> 342 <li class="sort" data-sort="date"># 시간순</li>
251 - <li class="filterlabel"># 수신 343 + <li class="filterlabel">
252 - <input type="checkbox" class="filter0" id="filter0" data_value=" get" /> 344 + <label for="filter0_1" class="filter0_label"># 수신 </label>
345 + <svg class="bi bi-check2" id="filter0_icon1" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
346 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
347 + </svg>
348 + <input type="checkbox" class="filter0" id="filter0_1" icon="filter0_icon1" data_value=" get"/>
253 </li> 349 </li>
254 - <li class="filterlabel"># 발신 350 + <li class="filterlabel">
255 - <input type="checkbox" class="filter0" id="filter0" data_value=" send" /> 351 + <label for="filter0_2" class="filter0_label"># 발신 </label>
352 + <svg class="bi bi-check2" id="filter0_icon2" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
353 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
354 + </svg>
355 + <input type="checkbox" class="filter0" id="filter0_2" icon="filter0_icon2" data_value=" send"/>
256 </li> 356 </li>
257 </div> 357 </div>
258 </div> 358 </div>
...@@ -267,12 +367,19 @@ ...@@ -267,12 +367,19 @@
267 </div> 367 </div>
268 </form> 368 </form>
269 <div id="myList_in"> 369 <div id="myList_in">
270 - <li class="sort" data-sort="date"># 시간순</li> 370 + <li class="filterlabel">
271 - <li class="filterlabel"># 수신 371 + <label for="filter1_1" class="filter1_label"># 수신 </label>
272 - <input type="checkbox" class="filter1" id="filter1" data_value=" get" /> 372 + <svg class="bi bi-check2" id="filter1_icon1" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
373 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
374 + </svg>
375 + <input type="checkbox" class="filter1" id="filter1_1" icon="filter1_icon1" data_value=" get"/>
273 </li> 376 </li>
274 - <li class="filterlabel"># 발신 377 + <li class="filterlabel">
275 - <input type="checkbox" class="filter1" id="filter1" data_value=" send" /> 378 + <label for="filter1_2" class="filter1_label"># 발신 </label>
379 + <svg class="bi bi-check2" id="filter1_icon2" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
380 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
381 + </svg>
382 + <input type="checkbox" class="filter1" id="filter1_2" icon="filter1_icon2" data_value=" send"/>
276 </li> 383 </li>
277 </div> 384 </div>
278 </div> 385 </div>
...@@ -288,11 +395,19 @@ ...@@ -288,11 +395,19 @@
288 </form> 395 </form>
289 <div id="myList_in"> 396 <div id="myList_in">
290 <li class="sort" data-sort="date"># 시간순</li> 397 <li class="sort" data-sort="date"># 시간순</li>
291 - <li class="filterlabel"># 수신 398 + <li class="filterlabel">
292 - <input type="checkbox" class="filter2" id="filter2" data_value=" get" /> 399 + <label for="filter2_1" class="filter2_label"># 수신 </label>
400 + <svg class="bi bi-check2" id="filter2_icon1" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
401 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
402 + </svg>
403 + <input type="checkbox" class="filter2" id="filter2_1" icon="filter2_icon1" data_value=" get"/>
293 </li> 404 </li>
294 - <li class="filterlabel"># 발신 405 + <li class="filterlabel">
295 - <input type="checkbox" class="filter2" id="filter2" data_value=" send" /> 406 + <label for="filter2_2" class="filter2_label"># 발신 </label>
407 + <svg class="bi bi-check2" id="filter2_icon2" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
408 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
409 + </svg>
410 + <input type="checkbox" class="filter2" id="filter2_2" icon="filter2_icon2" data_value=" send"/>
296 </li> 411 </li>
297 </div> 412 </div>
298 </div> 413 </div>
...@@ -308,11 +423,19 @@ ...@@ -308,11 +423,19 @@
308 </form> 423 </form>
309 <div id="myList_in"> 424 <div id="myList_in">
310 <li class="sort" data-sort="date"># 시간순</li> 425 <li class="sort" data-sort="date"># 시간순</li>
311 - <li class="filterlabel"># 수신 426 + <li class="filterlabel">
312 - <input type="checkbox" class="filter3" id="filter3" data_value=" get" /> 427 + <label for="filter3_1" class="filter3_label"># 수신 </label>
428 + <svg class="bi bi-check2" id="filter3_icon1" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
429 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
430 + </svg>
431 + <input type="checkbox" class="filter3" id="filter3_1" icon="filter3_icon1" data_value=" get"/>
313 </li> 432 </li>
314 - <li class="filterlabel"># 발신 433 + <li class="filterlabel">
315 - <input type="checkbox" class="filter3" id="filter3" data_value=" send" /> 434 + <label for="filter3_2" class="filter3_label"># 발신 </label>
435 + <svg class="bi bi-check2" id="filter3_icon2" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
436 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
437 + </svg>
438 + <input type="checkbox" class="filter3" id="filter3_2" icon="filter3_icon2" data_value=" send"/>
316 </li> 439 </li>
317 </div> 440 </div>
318 </div> 441 </div>
...@@ -328,16 +451,80 @@ ...@@ -328,16 +451,80 @@
328 </form> 451 </form>
329 <div id="myList_in"> 452 <div id="myList_in">
330 <li class="sort" data-sort="date"># 시간순</li> 453 <li class="sort" data-sort="date"># 시간순</li>
331 - <li class="filterlabel"># 수신 454 + <li class="filterlabel">
332 - <input type="checkbox" class="filter4" id="filter4" data_value=" get" /> 455 + <label for="filter4_1" class="filter4_label"># 수신 </label>
456 + <svg class="bi bi-check2" id="filter4_icon1" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
457 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
458 + </svg>
459 + <input type="checkbox" class="filter4" id="filter4_1" icon="filter4_icon1" data_value=" get"/>
333 </li> 460 </li>
334 - <li class="filterlabel"># 발신 461 + <li class="filterlabel">
335 - <input type="checkbox" class="filter4" id="filter4" data_value=" send" /> 462 + <label for="filter4_2" class="filter4_label"># 발신 </label>
463 + <svg class="bi bi-check2" id="filter4_icon2" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
464 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
465 + </svg>
466 + <input type="checkbox" class="filter4" id="filter4_2" icon="filter4_icon2" data_value=" send"/>
336 </li> 467 </li>
337 </div> 468 </div>
338 </div> 469 </div>
339 <ol class="list"></ol> 470 <ol class="list"></ol>
340 </div> 471 </div>
472 + <div id="payment6space" style="display:none;">
473 + <div id="myList">
474 + <form class="d-none d-sm-inline-block form-inline mr-auto ml-md-3 my-2 my-md-0 mw-100 navbar-search">
475 + <div class="input-group">
476 + <input type="text" class="search form-control bg-light border-0 small" placeholder="Search">
477 + </div>
478 + </form>
479 + <div id="myList_in">
480 + <li class="sort" data-sort="date"># 시간순</li>
481 + <li class="sort" data-sort="price"># 금액순</li>
482 + </div>
483 + </div>
484 + <ol class="list"></ol>
485 + </div>
486 + <div id="payment7space" style="display:none;">
487 + <div id="myList">
488 + <form class="d-none d-sm-inline-block form-inline mr-auto ml-md-3 my-2 my-md-0 mw-100 navbar-search">
489 + <div class="input-group">
490 + <input type="text" class="search form-control bg-light border-0 small" placeholder="Search">
491 + </div>
492 + </form>
493 + <div id="myList_in">
494 + <li class="sort" data-sort="date"># 시간순</li>
495 + <li class="sort" data-sort="price"># 금액순</li>
496 + </div>
497 + </div>
498 + <ol class="list"></ol>
499 + </div>
500 + <div id="payment8space" style="display:none;">
501 + <div id="myList">
502 + <form class="d-none d-sm-inline-block form-inline mr-auto ml-md-3 my-2 my-md-0 mw-100 navbar-search">
503 + <div class="input-group">
504 + <input type="text" class="search form-control bg-light border-0 small" placeholder="Search">
505 + </div>
506 + </form>
507 + <div id="myList_in">
508 + <li class="sort" data-sort="date"># 시간순</li>
509 + <li class="sort" data-sort="price"># 금액순</li>
510 + </div>
511 + </div>
512 + <ol class="list"></ol>
513 + </div>
514 + <div id="payment9space" style="display:none;">
515 + <div id="myList">
516 + <form class="d-none d-sm-inline-block form-inline mr-auto ml-md-3 my-2 my-md-0 mw-100 navbar-search">
517 + <div class="input-group">
518 + <input type="text" class="search form-control bg-light border-0 small" placeholder="Search">
519 + </div>
520 + </form>
521 + <div id="myList_in">
522 + <li class="sort" data-sort="date"># 시간순</li>
523 + <li class="sort" data-sort="price"># 금액순</li>
524 + </div>
525 + </div>
526 + <ol class="list"></ol>
527 + </div>
341 528
342 <div id="paymentspace" style="display:none;"> 529 <div id="paymentspace" style="display:none;">
343 <div id="myList"> 530 <div id="myList">
...@@ -348,23 +535,106 @@ ...@@ -348,23 +535,106 @@
348 </form> 535 </form>
349 <div id="myList_in"> 536 <div id="myList_in">
350 <li class="sort" data-sort="date"># 시간순</li> 537 <li class="sort" data-sort="date"># 시간순</li>
351 - <li class="filterlabel"># 체크 538 + <li class="filterlabel">
352 - <input type="checkbox" class="filter5" id="filter5" data_filter="payment_" data_value="체크" /> 539 + <label for="filter5_1" class="filter5_label"># 체크 </label>
540 + <svg class="bi bi-check2" id="filter5_icon1" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
541 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
542 + </svg>
543 + <input type="checkbox" class="filter5" id="filter5_1" icon="filter5_icon1" data_filter="payment_" data_value="체크"/>
544 + </li>
545 + <li class="filterlabel">
546 + <label for="filter5_2" class="filter5_label"># 일시불 </label>
547 + <svg class="bi bi-check2" id="filter5_icon2" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
548 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
549 + </svg>
550 + <input type="checkbox" class="filter5" id="filter5_2" icon="filter5_icon2" data_filter="payment_" data_value="일시불"/>
551 + </li>
552 + <li class="filterlabel">
553 + <label for="filter5_3" class="filter5_label"># 할부 </label>
554 + <svg class="bi bi-check2" id="filter5_icon3" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
555 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
556 + </svg>
557 + <input type="checkbox" class="filter5" id="filter5_3" icon="filter5_icon3" data_filter="payment_" data_value="할부"/>
558 + </li>
559 + <li class="sort" data-sort="price"># 금액순</li>
560 + <li class="filterlabel">
561 + <label for="filter5_4" class="filter5_label"># ~5만원 </label>
562 + <svg class="bi bi-check2" id="filter5_icon4" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
563 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
564 + </svg>
565 + <input type="checkbox" class="filter5" id="filter5_4" icon="filter5_icon4" data_filter="amount" data_value="less5"/>
566 + </li>
567 + <li class="filterlabel">
568 + <label for="filter5_5" class="filter5_label"># 5~10만원 </label>
569 + <svg class="bi bi-check2" id="filter5_icon5" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
570 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
571 + </svg>
572 + <input type="checkbox" class="filter5" id="filter5_5" icon="filter5_icon5" data_filter="amount" data_value="5to10"/>
573 + </li>
574 + <li class="filterlabel">
575 + <label for="filter5_6" class="filter5_label"># 10만원~ </label>
576 + <svg class="bi bi-check2" id="filter5_icon6" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
577 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
578 + </svg>
579 + <input type="checkbox" class="filter5" id="filter5_6" icon="filter5_icon6" data_filter="amount" data_value="more10"/>
580 + </li>
581 + </div>
582 + </div>
583 + <ol class="list"></ol>
584 + </div>
585 + </div>
586 + </div>
587 + <div id="payment1space" style="display:none;">
588 + <div id="myList">
589 + <form class="d-none d-sm-inline-block form-inline mr-auto ml-md-3 my-2 my-md-0 mw-100 navbar-search">
590 + <div class="input-group">
591 + <input type="text" class="search form-control bg-light border-0 small" placeholder="Search">
592 + </div>
593 + </form>
594 + <div id="myList_in">
595 + <li class="sort" data-sort="date"># 시간순</li>
596 + <li class="filterlabel">
597 + <label for="filter6_1" class="filter6_label"># 체크 </label>
598 + <svg class="bi bi-check2" id="filter6_icon1" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
599 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
600 + </svg>
601 + <input type="checkbox" class="filter6" id="filter6_1" icon="filter6_icon1" data_filter="payment_" data_value="체크"/>
353 </li> 602 </li>
354 - <li class="filterlabel"># 일시불 603 + <li class="filterlabel">
355 - <input type="checkbox" class="filter5" id="filter5" data_filter="payment_" data_value="일시불" /> 604 + <label for="filter6_2" class="filter6_label"># 일시불 </label>
605 + <svg class="bi bi-check2" id="filter6_icon2" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
606 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
607 + </svg>
608 + <input type="checkbox" class="filter6" id="filter6_2" icon="filter6_icon2" data_filter="payment_" data_value="일시불"/>
356 </li> 609 </li>
357 - <li class="filterlabel"># 할부 610 + <li class="filterlabel">
358 - <input type="checkbox" class="filter5" id="filter5" data_filter="payment_" data_value="할부" /> 611 + <label for="filter6_3" class="filter6_label"># 할부 </label>
612 + <svg class="bi bi-check2" id="filter6_icon3" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
613 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
614 + </svg>
615 + <input type="checkbox" class="filter6" id="filter6_3" icon="filter6_icon3" data_filter="payment_" data_value="할부"/>
359 </li> 616 </li>
360 - <li class="filterlabel"># ~5만원 617 + <li class="sort" data-sort="price"># 금액순</li>
361 - <input type="checkbox" class="filter5" id="filter5" data_filter="amount" data_value="less5" /> 618 + <li class="filterlabel">
619 + <label for="filter6_4" class="filter6_label"># ~5만원 </label>
620 + <svg class="bi bi-check2" id="filter6_icon4" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
621 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
622 + </svg>
623 + <input type="checkbox" class="filter6" id="filter6_4" icon="filter6_icon4" data_filter="amount" data_value="less5"/>
362 </li> 624 </li>
363 - <li class="filterlabel"># 5~10만원 625 + <li class="filterlabel">
364 - <input type="checkbox" class="filter5" id="filter5" data_filter="amount" data_value="5to10" /> 626 + <label for="filter6_5" class="filter6_label"># 5~10만원 </label>
627 + <svg class="bi bi-check2" id="filter6_icon5" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
628 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
629 + </svg>
630 + <input type="checkbox" class="filter6" id="filter6_5" icon="filter6_icon5" data_filter="amount" data_value="5to10"/>
365 </li> 631 </li>
366 - <li class="filterlabel"># 10만원~ 632 + <li class="filterlabel">
367 - <input type="checkbox" class="filter5" id="filter5" data_filter="amount" data_value="more10" /> 633 + <label for="filter6_6" class="filter6_label"># 10만원~ </label>
634 + <svg class="bi bi-check2" id="filter6_icon6" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg" style="display:none;">
635 + <path fill-rule="evenodd" d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
636 + </svg>
637 + <input type="checkbox" class="filter6" id="filter6_6" icon="filter6_icon6" data_filter="amount" data_value="more10"/>
368 </li> 638 </li>
369 </div> 639 </div>
370 </div> 640 </div>
......
...@@ -9,9 +9,18 @@ var label_data_text_2=""; ...@@ -9,9 +9,18 @@ var label_data_text_2="";
9 var label_data_1=[]; 9 var label_data_1=[];
10 var label_data_2=[]; 10 var label_data_2=[];
11 11
12 - 12 +var paylist_date_start="";
13 +var paylist_date_end="";
13 var date_start=""; 14 var date_start="";
14 var date_end=""; 15 var date_end="";
16 +var payment_date_start="";
17 +var payment_ate_end="";
18 +var card_date_start="";
19 +var card_date_end="";
20 +var store_date_start="";
21 +var store_date_end="";
22 +var keyword_date_start="";
23 +var keyword_date_end="";
15 var number=[]; 24 var number=[];
16 25
17 var keyword_1_list=[]; 26 var keyword_1_list=[];
...@@ -61,14 +70,20 @@ const keyword1space = document.getElementById("keyword1space"); ...@@ -61,14 +70,20 @@ const keyword1space = document.getElementById("keyword1space");
61 const keyword2space = document.getElementById("keyword2space"); 70 const keyword2space = document.getElementById("keyword2space");
62 const keyword3space = document.getElementById("keyword3space"); 71 const keyword3space = document.getElementById("keyword3space");
63 const keyword4space = document.getElementById("keyword4space"); 72 const keyword4space = document.getElementById("keyword4space");
73 +const payment6space = document.getElementById("payment6space");
74 +const payment7space = document.getElementById("payment7space");
75 +const payment8space = document.getElementById("payment8space");
76 +const payment9space = document.getElementById("payment9space");
64 const between_submit = document.getElementById("between_date_submit"); 77 const between_submit = document.getElementById("between_date_submit");
65 const with_submit = document.getElementById("number_submit"); 78 const with_submit = document.getElementById("number_submit");
66 const paymentspace = document.getElementById("paymentspace"); 79 const paymentspace = document.getElementById("paymentspace");
80 +const payment1space = document.getElementById("payment1space");
67 var keyword0 = document.getElementById('keyword'); 81 var keyword0 = document.getElementById('keyword');
68 var keyword1 = document.getElementById('keyword1'); 82 var keyword1 = document.getElementById('keyword1');
69 var keyword2 = document.getElementById('keyword2'); 83 var keyword2 = document.getElementById('keyword2');
70 var keyword3 = document.getElementById('keyword3'); 84 var keyword3 = document.getElementById('keyword3');
71 var keyword4 = document.getElementById('keyword4'); 85 var keyword4 = document.getElementById('keyword4');
86 +var payment0 = document.getElementById('payment0');
72 var payment1 = document.getElementById('payment1'); 87 var payment1 = document.getElementById('payment1');
73 var payment2 = document.getElementById('payment2'); 88 var payment2 = document.getElementById('payment2');
74 var payment3 = document.getElementById('payment3'); 89 var payment3 = document.getElementById('payment3');
...@@ -85,8 +100,14 @@ var options_charts_1 = { ...@@ -85,8 +100,14 @@ var options_charts_1 = {
85 display:true, 100 display:true,
86 text:title_text 101 text:title_text
87 }, 102 },
88 - maintainAspectRatio: true, 103 + maintainAspectRatio: false,
89 scales: { 104 scales: {
105 + xAxes: [{
106 + stacked:true,
107 + ticks: {
108 + beginAtZero:true
109 + }
110 + }],
90 yAxes: [{ 111 yAxes: [{
91 ticks: { 112 ticks: {
92 beginAtZero:true 113 beginAtZero:true
...@@ -101,8 +122,14 @@ var options_charts_2 = { ...@@ -101,8 +122,14 @@ var options_charts_2 = {
101 display:true, 122 display:true,
102 text:title_text 123 text:title_text
103 }, 124 },
104 - maintainAspectRatio: true, 125 + maintainAspectRatio: false,
105 scales: { 126 scales: {
127 + xAxes: [{
128 + stacked:true,
129 + ticks: {
130 + beginAtZero:true
131 + }
132 + }],
106 yAxes: [{ 133 yAxes: [{
107 ticks: { 134 ticks: {
108 beginAtZero:true 135 beginAtZero:true
...@@ -139,6 +166,10 @@ var options_chart_2={ ...@@ -139,6 +166,10 @@ var options_chart_2={
139 options: options_charts_2 166 options: options_charts_2
140 }; 167 };
141 168
169 +function numberWithCommas(x) {
170 + return x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
171 +}
172 +
142 var mysql = require('mysql'); 173 var mysql = require('mysql');
143 var connection = mysql.createConnection({ 174 var connection = mysql.createConnection({
144 host:'localhost', 175 host:'localhost',
...@@ -156,6 +187,10 @@ connection.query('select MIN(date) "min", MAX(date) "max" from calllog;', functi ...@@ -156,6 +187,10 @@ connection.query('select MIN(date) "min", MAX(date) "max" from calllog;', functi
156 document.getElementById('between_date_start').max=(rows[0].max.toISOString().split("T")[0]); 187 document.getElementById('between_date_start').max=(rows[0].max.toISOString().split("T")[0]);
157 document.getElementById('between_date_end').min=(rows[0].min.toISOString().split("T")[0]); 188 document.getElementById('between_date_end').min=(rows[0].min.toISOString().split("T")[0]);
158 document.getElementById('between_date_end').max=(rows[0].max.toISOString().split("T")[0]); 189 document.getElementById('between_date_end').max=(rows[0].max.toISOString().split("T")[0]);
190 + document.getElementById('between_paylist_date_start').min=(rows[0].min.toISOString().split("T")[0]);
191 + document.getElementById('between_paylist_date_start').max=(rows[0].max.toISOString().split("T")[0]);
192 + document.getElementById('between_paylist_date_end').min=(rows[0].min.toISOString().split("T")[0]);
193 + document.getElementById('between_paylist_date_end').max=(rows[0].max.toISOString().split("T")[0]);
159 document.getElementById('between_amount_date_start').min=(rows[0].min.toISOString().split("T")[0]); 194 document.getElementById('between_amount_date_start').min=(rows[0].min.toISOString().split("T")[0]);
160 document.getElementById('between_amount_date_start').max=(rows[0].max.toISOString().split("T")[0]); 195 document.getElementById('between_amount_date_start').max=(rows[0].max.toISOString().split("T")[0]);
161 document.getElementById('between_amount_date_end').min=(rows[0].min.toISOString().split("T")[0]); 196 document.getElementById('between_amount_date_end').min=(rows[0].min.toISOString().split("T")[0]);
...@@ -195,6 +230,11 @@ var values_list_all = []; ...@@ -195,6 +230,11 @@ var values_list_all = [];
195 var values_list_between = []; 230 var values_list_between = [];
196 var values_list_with = []; 231 var values_list_with = [];
197 var values_payment_list_all = []; 232 var values_payment_list_all = [];
233 +var values_payment_list_between = [];
234 +var values_list_card_rank=[];
235 +var values_list_card_rank_between=[];
236 +var values_list_store_rank=[];
237 +var values_list_store_rank_between=[];
198 238
199 var myList; 239 var myList;
200 var myList1 = new List("keyword1space", options_list, values_list_1); 240 var myList1 = new List("keyword1space", options_list, values_list_1);
...@@ -202,6 +242,11 @@ var myList2 = new List("keyword2space", options_list, values_list_all); ...@@ -202,6 +242,11 @@ var myList2 = new List("keyword2space", options_list, values_list_all);
202 var myList3 = new List("keyword3space", options_list, values_list_between); 242 var myList3 = new List("keyword3space", options_list, values_list_between);
203 var myList4 = new List("keyword4space", options_list, values_list_with); 243 var myList4 = new List("keyword4space", options_list, values_list_with);
204 var myList5; 244 var myList5;
245 +var myList5_1 = new List("payment1space", options_list_pay, values_payment_list_between);
246 +var myList6 = new List("payment6space", options_list, values_list_card_rank);
247 +var myList7 = new List("payment7space", options_list, values_list_card_rank_between);
248 +var myList8 = new List("payment8space", options_list, values_list_store_rank);
249 +var myList9 = new List("payment9space", options_list, values_list_store_rank_between);
205 250
206 connection.query('update contact set number=replace(number,"-","");', function(err, rows, fields){ 251 connection.query('update contact set number=replace(number,"-","");', function(err, rows, fields){
207 if(err) 252 if(err)
...@@ -290,7 +335,7 @@ PythonShell.run('src/analysis_message_bank.py', option, function(err, result){ ...@@ -290,7 +335,7 @@ PythonShell.run('src/analysis_message_bank.py', option, function(err, result){
290 if (price_temp < 50000){amount_temp="less5";} 335 if (price_temp < 50000){amount_temp="less5";}
291 else if (price_temp >=50000 && price_temp <100000){amount_temp="5to10";} 336 else if (price_temp >=50000 && price_temp <100000){amount_temp="5to10";}
292 else{amount_temp="more10";} 337 else{amount_temp="more10";}
293 - values_payment_list_all.push({bname:bname_temp, payment:payplan_temp ,payment_:payplan__temp ,price:price_temp+"원",amount:amount_temp,sname:sname_temp, date:date_temp}); 338 + values_payment_list_all.push({bname:bname_temp, payment:payplan_temp ,payment_:payplan__temp ,price:numberWithCommas(price_temp)+"원",amount:amount_temp,sname:sname_temp, date:date_temp});
294 } 339 }
295 myList5 = new List("paymentspace", options_list_pay, values_payment_list_all); 340 myList5 = new List("paymentspace", options_list_pay, values_payment_list_all);
296 } 341 }
...@@ -399,7 +444,54 @@ function chartspaceview(){ ...@@ -399,7 +444,54 @@ function chartspaceview(){
399 keyword2space.style="display:none"; 444 keyword2space.style="display:none";
400 keyword3space.style="display:none"; 445 keyword3space.style="display:none";
401 keyword4space.style="display:none"; 446 keyword4space.style="display:none";
447 + payment6space.style="display:none";
448 + payment7space.style="display:none";
449 + payment8space.style="display:none";
450 + payment9space.style="display:none";
402 paymentspace.style="display:none"; 451 paymentspace.style="display:none";
452 + payment1space.style="display:none";
453 +}
454 +
455 +function changeLabelText(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s){
456 +
457 + options_chart_1.type="bar";
458 + options_chart_1.data.labels=a;
459 + options_chart_1.data.datasets[0].label=b;
460 + options_chart_1.data.datasets[0].data=c;
461 +
462 + options_chart_2.type="bar";
463 + options_chart_2.data.labels=d;
464 + options_chart_2.data.datasets[0].label=e;
465 + options_chart_2.data.datasets[0].data=f;
466 +
467 + box_name.innerHTML=i;
468 + menu_name.innerHTML=h;
469 + options_charts_1.title.text=g;
470 + options_charts_2.title.text=g;
471 +
472 + options_chart_1.options=options_charts_1;
473 + options_chart_2.options=options_charts_2;
474 +}
475 +
476 +function changeLabelText_hor(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s){
477 +
478 + options_chart_1.type="horizontalBar";
479 + options_chart_1.data.labels=a;
480 + options_chart_1.data.datasets[0].label=b;
481 + options_chart_1.data.datasets[0].data=c;
482 +
483 + options_chart_2.type="horizontalBar";
484 + options_chart_2.data.labels=d;
485 + options_chart_2.data.datasets[0].label=e;
486 + options_chart_2.data.datasets[0].data=f;
487 +
488 + box_name.innerHTML=i;
489 + menu_name.innerHTML=h;
490 + options_charts_1.title.text=g;
491 + options_charts_2.title.text=g;
492 +
493 + options_chart_1.options=options_charts_1;
494 + options_chart_2.options=options_charts_2;
403 } 495 }
404 496
405 keyword0.addEventListener('click', function(){ 497 keyword0.addEventListener('click', function(){
...@@ -410,63 +502,64 @@ keyword0.addEventListener('click', function(){ ...@@ -410,63 +502,64 @@ keyword0.addEventListener('click', function(){
410 keyword2space.style="display:none"; 502 keyword2space.style="display:none";
411 keyword3space.style="display:none"; 503 keyword3space.style="display:none";
412 keyword4space.style="display:none"; 504 keyword4space.style="display:none";
505 + payment6space.style="display:none";
506 + payment7space.style="display:none";
507 + payment8space.style="display:none";
508 + payment9space.style="display:none";
413 paymentspace.style="display:none"; 509 paymentspace.style="display:none";
414 - menu_name.innerHTML="전체 문자의 키워드 목록"; 510 + payment1space.style="display:none";
511 + menu_name.innerHTML="전체 기간의 문자의 키워드 목록";
415 }); 512 });
416 513
417 keyword1.addEventListener('click', function(){ 514 keyword1.addEventListener('click', function(){
418 choosed_menu="keyword1"; 515 choosed_menu="keyword1";
419 chartspaceview(); 516 chartspaceview();
420 - menu_name.innerHTML="최근 1개월 문자 키워드 순위"; 517 +
421 - box_name.innerHTML="# 언급 횟수"; 518 + changeLabelText(keyword_1_list,"언급 횟수",keyword_1_count,[],"",[],"최근 1개월의 문자 키워드","최근 1개월의 문자 키워드 순위","# 언급 횟수");
422 - options_chart_1.options.title.text="최근 1개월 문자 키워드"; 519 +
423 - options_chart_1.data.labels=keyword_1_list;
424 - options_chart_1.data.datasets[0].label="언급 횟수";
425 - options_chart_1.data.datasets[0].data=keyword_1_count;
426 window.myChart.destroy(); 520 window.myChart.destroy();
521 + document.getElementById("myChart").height="350";
522 + document.getElementById("chart-area").style="height:380px;";
427 window.myChart = new Chart(ctx, options_chart_1); 523 window.myChart = new Chart(ctx, options_chart_1);
428 }); 524 });
429 525
430 keyword2.addEventListener('click', function(){ 526 keyword2.addEventListener('click', function(){
431 choosed_menu="keyword2"; 527 choosed_menu="keyword2";
432 chartspaceview(); 528 chartspaceview();
433 - menu_name.innerHTML="전체 문자 키워드 순위"; 529 +
434 - box_name.innerHTML="# 언급 횟수"; 530 + changeLabelText(keyword_all_list,"언급 횟수",keyword_all_count,[],"",[],"전체 기간의 문자 키워드","전체 기간의 문자 키워드 순위","# 언급 횟수");
435 - options_chart_1.options.title.text="전체 문자 키워드"; 531 +
436 - options_chart_1.data.labels=keyword_all_list;
437 - options_chart_1.data.datasets[0].label="언급 횟수";
438 - options_chart_1.data.datasets[0].data=keyword_all_count;
439 window.myChart.destroy(); 532 window.myChart.destroy();
533 + document.getElementById("myChart").height="350";
534 + document.getElementById("chart-area").style="height:380px;";
440 window.myChart = new Chart(ctx, options_chart_1); 535 window.myChart = new Chart(ctx, options_chart_1);
441 }); 536 });
442 537
443 keyword3.addEventListener('click', function(){ 538 keyword3.addEventListener('click', function(){
444 choosed_menu="keyword3"; 539 choosed_menu="keyword3";
445 chartspaceview(); 540 chartspaceview();
446 - menu_name.innerHTML="특정 기간의 문자 키워드 순위"; 541 +
447 - box_name.innerHTML="# 언급 횟수"; 542 + changeLabelText(keyword_between_list,"언급 횟수",keyword_between_count,[],"",[],"특정 기간의 문자 키워드","특정 기간의 문자 키워드 순위 / "+keyword_date_start.split(' ')[0]+" ~ "+keyword_date_end.split(' ')[0],"# 언급 횟수");
448 - options_chart_1.options.title.text="특정 기간의 문자 키워드"; 543 +
449 - options_chart_1.data.labels=keyword_between_list;
450 - options_chart_1.data.datasets[0].label="언급 횟수";
451 - options_chart_1.data.datasets[0].data=keyword_between_count;
452 window.myChart.destroy(); 544 window.myChart.destroy();
545 + document.getElementById("myChart").height="350";
546 + document.getElementById("chart-area").style="height:380px;";
453 window.myChart = new Chart(ctx, options_chart_1); 547 window.myChart = new Chart(ctx, options_chart_1);
454 }); 548 });
455 549
456 keyword4.addEventListener('click', function(){ 550 keyword4.addEventListener('click', function(){
457 choosed_menu="keyword4"; 551 choosed_menu="keyword4";
458 chartspaceview(); 552 chartspaceview();
459 - menu_name.innerHTML="특정 연락처와의 문자 키워드 순위"; 553 +
460 - box_name.innerHTML="# 언급 횟수"; 554 + changeLabelText(keyword_with_list,"언급 횟수",keyword_with_count,[],"",[],"특정 연락처와의 문자 키워드","특정 연락처와의 문자 키워드 순위","# 언급 횟수");
461 - options_chart_1.options.title.text="특정 연락처와의 문자 키워드"; 555 +
462 - options_chart_1.data.labels=keyword_with_list;
463 - options_chart_1.data.datasets[0].label="언급 횟수";
464 - options_chart_1.data.datasets[0].data=keyword_with_count;
465 window.myChart.destroy(); 556 window.myChart.destroy();
557 + document.getElementById("myChart").height="350";
558 + document.getElementById("chart-area").style="height:380px;";
466 window.myChart = new Chart(ctx, options_chart_1); 559 window.myChart = new Chart(ctx, options_chart_1);
467 }); 560 });
468 561
469 -payment1.addEventListener('click', function(){ 562 +payment0.addEventListener('click', function(){
470 keywordspace.style="display:none"; 563 keywordspace.style="display:none";
471 choicespace.style="display:none"; 564 choicespace.style="display:none";
472 chartspace.style="display:none"; 565 chartspace.style="display:none";
...@@ -474,28 +567,44 @@ payment1.addEventListener('click', function(){ ...@@ -474,28 +567,44 @@ payment1.addEventListener('click', function(){
474 keyword2space.style="display:none"; 567 keyword2space.style="display:none";
475 keyword3space.style="display:none"; 568 keyword3space.style="display:none";
476 keyword4space.style="display:none"; 569 keyword4space.style="display:none";
570 + payment6space.style="display:none";
571 + payment7space.style="display:none";
572 + payment8space.style="display:none";
573 + payment9space.style="display:none";
477 paymentspace.style="display:inline"; 574 paymentspace.style="display:inline";
575 + payment1space.style="display:none";
478 menu_name.innerHTML="결제문자 목록"; 576 menu_name.innerHTML="결제문자 목록";
479 }); 577 });
480 578
579 +payment1.addEventListener('click', function(){
580 + keywordspace.style="display:none";
581 + choicespace.style="display:none";
582 + chartspace.style="display:none";
583 + keyword1space.style="display:none";
584 + keyword2space.style="display:none";
585 + keyword3space.style="display:none";
586 + keyword4space.style="display:none";
587 + payment6space.style="display:none";
588 + payment7space.style="display:none";
589 + payment8space.style="display:none";
590 + payment9space.style="display:none";
591 + paymentspace.style="display:none";
592 + payment1space.style="display:inline";
593 + menu_name.innerHTML="특정 기간의 결제문자 목록 / "+paylist_date_start.split(' ')[0]+" ~ "+paylist_date_end.split(' ')[0];
594 +});
595 +
481 payment2.addEventListener('click', function(){ 596 payment2.addEventListener('click', function(){
482 chartspaceview(); 597 chartspaceview();
483 type1.innerHTML="# 결제 금액"; 598 type1.innerHTML="# 결제 금액";
484 type2.innerHTML="# 누적 결제 금액"; 599 type2.innerHTML="# 누적 결제 금액";
485 choicespace.style="display:inline"; 600 choicespace.style="display:inline";
486 - box_name.innerHTML="# 결제 금액";
487 choosed_menu="payment2"; 601 choosed_menu="payment2";
488 602
489 - menu_name.innerHTML="전체 기간의 결제 금액 통계"; 603 + changeLabelText(payment_1_list,"결제 금액",payment_1_count,payment_2_list,"누적 결제 금액",payment_2_count, "전체 기간의 결제 금액 통계","전체 기간의 결제 금액 통계","# 결제 금액");
490 - options_chart_1.options.title.text="전체 기간의 결제 금액 통계"; 604 +
491 - options_chart_1.data.labels=payment_1_list;
492 - options_chart_1.data.datasets[0].label="결제 금액";
493 - options_chart_1.data.datasets[0].data=payment_1_count;
494 - options_charts_2.title.text="전체 기간의 누적 결제 금액 통계";
495 - options_chart_2.data.labels=payment_2_list;
496 - options_chart_2.data.datasets[0].label="누적 결제 금액";
497 - options_chart_2.data.datasets[0].data=payment_2_count;
498 window.myChart.destroy(); 605 window.myChart.destroy();
606 + document.getElementById("myChart").height="350";
607 + document.getElementById("chart-area").style="height:380px;";
499 window.myChart = new Chart(ctx, options_chart_1); 608 window.myChart = new Chart(ctx, options_chart_1);
500 }); 609 });
501 610
...@@ -504,136 +613,102 @@ payment3.addEventListener('click', function(){ ...@@ -504,136 +613,102 @@ payment3.addEventListener('click', function(){
504 type1.innerHTML="# 결제 금액"; 613 type1.innerHTML="# 결제 금액";
505 type2.innerHTML="# 누적 결제 금액"; 614 type2.innerHTML="# 누적 결제 금액";
506 choicespace.style="display:inline"; 615 choicespace.style="display:inline";
507 - box_name.innerHTML="# 결제 금액";
508 choosed_menu="payment3"; 616 choosed_menu="payment3";
509 617
510 - menu_name.innerHTML="특정 기간의 결제 금액 통계"; 618 + changeLabelText(payment_3_list,"결제 금액",payment_3_count,payment_4_list,"누적 결제 금액",payment_4_count,"특정 기간의 결제 금액 통계","특정 기간의 결제 금액 통계 / "+date_start.split(' ')[0]+" ~ "+date_end.split(' ')[0],"# 결제 금액");
511 - options_chart_1.options.title.text="특정 기간의 결제 금액 통계"; 619 +
512 - options_chart_1.data.labels=payment_3_list;
513 - options_chart_1.data.datasets[0].label="결제 금액";
514 - options_chart_1.data.datasets[0].data=payment_3_count;
515 - options_charts_2.title.text="특정 기간의 누적 결제 금액 통계";
516 - options_chart_2.data.labels=payment_4_list;
517 - options_chart_2.data.datasets[0].label="누적 결제 금액";
518 - options_chart_2.data.datasets[0].data=payment_4_count;
519 window.myChart.destroy(); 620 window.myChart.destroy();
621 + document.getElementById("myChart").height="350";
622 + document.getElementById("chart-area").style="height:380px;";
520 window.myChart = new Chart(ctx, options_chart_1); 623 window.myChart = new Chart(ctx, options_chart_1);
521 }); 624 });
522 625
523 payment4.addEventListener('click', function(){ 626 payment4.addEventListener('click', function(){
524 chartspaceview(); 627 chartspaceview();
628 + choosed_menu="payment4";
629 +
630 + changeLabelText(payment_5_list,"결제 횟수",payment_5_count,[],"",[],"전체 기간의 결제 시간대","전체 기간의 결제 시간대","# 결제 횟수");
525 631
526 - menu_name.innerHTML="전체 기간의 결제 시간대";
527 - box_name.innerHTML="# 결제 횟수";
528 - options_chart_1.options.title.text="전체 기간의 결제 시간대";
529 - options_chart_1.data.labels=payment_5_list;
530 - options_chart_1.data.datasets[0].label="결제 횟수";
531 - options_chart_1.data.datasets[0].data=payment_5_count;
532 window.myChart.destroy(); 632 window.myChart.destroy();
633 + document.getElementById("myChart").height="350";
634 + document.getElementById("chart-area").style="height:380px;";
533 window.myChart = new Chart(ctx, options_chart_1); 635 window.myChart = new Chart(ctx, options_chart_1);
534 }); 636 });
535 637
536 payment5.addEventListener('click', function(){ 638 payment5.addEventListener('click', function(){
537 chartspaceview(); 639 chartspaceview();
640 + choosed_menu="payment5";
641 +
642 + changeLabelText(payment_6_list,"결제 횟수",payment_6_count,[],"",[],"특정 기간의 결제 시간대","특정 기간의 결제 시간대 / "+payment_date_start.split(' ')[0]+" ~ "+payment_date_end.split(' ')[0],"# 결제 횟수");
538 643
539 - menu_name.innerHTML="특정 기간의 결제 시간대";
540 - box_name.innerHTML="# 결제 횟수";
541 - options_chart_1.options.title.text="특정 기간의 결제 시간대";
542 - options_chart_1.data.labels=payment_6_list;
543 - options_chart_1.data.datasets[0].label="결제 횟수";
544 - options_chart_1.data.datasets[0].data=payment_6_count;
545 window.myChart.destroy(); 644 window.myChart.destroy();
645 + document.getElementById("myChart").height="350";
646 + document.getElementById("chart-area").style="height:380px;";
546 window.myChart = new Chart(ctx, options_chart_1); 647 window.myChart = new Chart(ctx, options_chart_1);
547 }); 648 });
548 649
549 payment6.addEventListener('click', function(){ 650 payment6.addEventListener('click', function(){
550 chartspaceview(); 651 chartspaceview();
652 + choosed_menu="payment6";
551 type1.innerHTML="# 결제 횟수 기준"; 653 type1.innerHTML="# 결제 횟수 기준";
552 type2.innerHTML="# 결제 금액 기준"; 654 type2.innerHTML="# 결제 금액 기준";
553 choicespace.style="display:inline"; 655 choicespace.style="display:inline";
554 - box_name.innerHTML="# 결제 횟수 기준";
555 - choosed_menu="payment6";
556 656
557 - menu_name.innerHTML="전체 기간의 카드 이용 순위"; 657 + changeLabelText_hor(payment_7_list,"결제 횟수",payment_7_count,payment_8_list,"결제 금액",payment_8_count,"전체 기간의 카드 이용 순위", "전체 기간의 카드 이용 순위", "# 결제 횟수 기준");
558 - options_chart_1.options.title.text="전체 기간의 카드 이용 순위"; 658 +
559 - options_chart_1.data.labels=payment_7_list;
560 - options_chart_1.data.datasets[0].label="결제 횟수";
561 - options_chart_1.data.datasets[0].data=payment_7_count;
562 - options_charts_2.title.text="전체 기간의 카드 이용 순위";
563 - options_chart_2.data.labels=payment_8_list;
564 - options_chart_2.data.datasets[0].label="결제 금액";
565 - options_chart_2.data.datasets[0].data=payment_8_count;
566 window.myChart.destroy(); 659 window.myChart.destroy();
660 + document.getElementById("myChart").height="1000";
661 + document.getElementById("chart-area").style="height:1030px;";
567 window.myChart = new Chart(ctx, options_chart_1); 662 window.myChart = new Chart(ctx, options_chart_1);
568 }); 663 });
569 664
570 payment7.addEventListener('click', function(){ 665 payment7.addEventListener('click', function(){
571 chartspaceview(); 666 chartspaceview();
667 + choosed_menu="payment7";
572 type1.innerHTML="# 결제 횟수 기준"; 668 type1.innerHTML="# 결제 횟수 기준";
573 type2.innerHTML="# 결제 금액 기준"; 669 type2.innerHTML="# 결제 금액 기준";
574 choicespace.style="display:inline"; 670 choicespace.style="display:inline";
575 - box_name.innerHTML="# 결제 횟수 기준";
576 - choosed_menu="payment7";
577 671
578 - menu_name.innerHTML="특정 기간의 카드 이용 순위"; 672 + changeLabelText_hor(payment_9_list,"결제 횟수",payment_9_count,payment_10_list,"결제 금액",payment_10_count,"특정 기간의 카드 이용 순위","특정 기간의 카드 이용 순위 / "+card_date_start.split(' ')[0]+" ~ "+card_date_end.split(' ')[0],"# 결제 횟수 기준");
579 - options_chart_1.options.title.text="특정 기간의 카드 이용 순위"; 673 +
580 - options_chart_1.data.labels=payment_9_list;
581 - options_chart_1.data.datasets[0].label="결제 횟수";
582 - options_chart_1.data.datasets[0].data=payment_9_count;
583 - options_charts_2.title.text="특정 기간의 카드 이용 순위";
584 - options_chart_2.data.labels=payment_10_list;
585 - options_chart_2.data.datasets[0].label="결제 금액";
586 - options_chart_2.data.datasets[0].data=payment_10_count;
587 window.myChart.destroy(); 674 window.myChart.destroy();
675 + document.getElementById("myChart").height="1000";
676 + document.getElementById("chart-area").style="height:1030px;";
588 window.myChart = new Chart(ctx, options_chart_1); 677 window.myChart = new Chart(ctx, options_chart_1);
589 }); 678 });
590 679
591 payment8.addEventListener('click', function(){ 680 payment8.addEventListener('click', function(){
592 chartspaceview(); 681 chartspaceview();
682 + choosed_menu="payment8";
593 type1.innerHTML="# 결제 횟수 기준"; 683 type1.innerHTML="# 결제 횟수 기준";
594 type2.innerHTML="# 결제 금액 기준"; 684 type2.innerHTML="# 결제 금액 기준";
595 choicespace.style="display:inline"; 685 choicespace.style="display:inline";
596 - box_name.innerHTML="# 결제 횟수 기준";
597 - choosed_menu="payment8";
598 686
599 - menu_name.innerHTML="전체 기간의 사용처 순위"; 687 + changeLabelText_hor(payment_11_list,"결제 횟수",payment_11_count,payment_12_list,"결제 금액",payment_12_count,"전체 기간의 사용처 순위","전체 기간의 사용처 순위","# 결제 횟수 기준");
600 - options_chart_1.options.title.text="전체 기간의 사용처 순위"; 688 +
601 - options_chart_1.data.labels=payment_11_list;
602 - options_chart_1.data.datasets[0].label="결제 횟수";
603 - options_chart_1.data.datasets[0].data=payment_11_count;
604 - options_charts_2.title.text="전체 기간의 사용처 순위";
605 - options_chart_2.data.labels=payment_12_list;
606 - options_chart_2.data.datasets[0].label="결제 금액";
607 - options_chart_2.data.datasets[0].data=payment_12_count;
608 window.myChart.destroy(); 689 window.myChart.destroy();
690 + document.getElementById("myChart").height="1000";
691 + document.getElementById("chart-area").style="height:1030px;";
609 window.myChart = new Chart(ctx, options_chart_1); 692 window.myChart = new Chart(ctx, options_chart_1);
610 }); 693 });
611 694
612 payment9.addEventListener('click', function(){ 695 payment9.addEventListener('click', function(){
613 chartspaceview(); 696 chartspaceview();
697 + choosed_menu="payment9";
614 type1.innerHTML="# 결제 횟수 기준"; 698 type1.innerHTML="# 결제 횟수 기준";
615 type2.innerHTML="# 결제 금액 기준"; 699 type2.innerHTML="# 결제 금액 기준";
616 choicespace.style="display:inline"; 700 choicespace.style="display:inline";
617 - box_name.innerHTML="# 결제 횟수 기준";
618 - choosed_menu="payment9";
619 701
620 - menu_name.innerHTML="특정 기간의 사용처 순위"; 702 + changeLabelText_hor(payment_13_list,"결제 횟수",payment_13_count,payment_14_list,"결제 금액",payment_14_count,"특정 기간의 사용처 순위","특정 기간의 사용처 순위 / "+store_date_start.split(' ')[0]+" ~ "+store_date_end.split(' ')[0],"# 결제 횟수 기준");
621 - options_chart_1.options.title.text="특정 기간의 사용처 순위"; 703 +
622 - options_chart_1.data.labels=payment_13_list;
623 - options_chart_1.data.datasets[0].label="결제 횟수";
624 - options_chart_1.data.datasets[0].data=payment_13_count;
625 - options_charts_2.title.text="특정 기간의 사용처 순위";
626 - options_chart_2.data.labels=payment_14_list;
627 - options_chart_2.data.datasets[0].label="결제 금액";
628 - options_chart_2.data.datasets[0].data=payment_14_count;
629 window.myChart.destroy(); 704 window.myChart.destroy();
705 + document.getElementById("myChart").height="1000";
706 + document.getElementById("chart-area").style="height:1030px;";
630 window.myChart = new Chart(ctx, options_chart_1); 707 window.myChart = new Chart(ctx, options_chart_1);
631 }); 708 });
632 709
633 var type1 = document.getElementById('type1'); 710 var type1 = document.getElementById('type1');
634 type1.addEventListener('click', function(){ 711 type1.addEventListener('click', function(){
635 - window.myChart.destroy();
636 - window.myChart = new Chart(ctx, options_chart_1);
637 switch(choosed_menu){ 712 switch(choosed_menu){
638 case 'payment2': 713 case 'payment2':
639 case 'payment3': 714 case 'payment3':
...@@ -646,12 +721,12 @@ type1.addEventListener('click', function(){ ...@@ -646,12 +721,12 @@ type1.addEventListener('click', function(){
646 box_name.innerHTML="# 결제 횟수 기준"; 721 box_name.innerHTML="# 결제 횟수 기준";
647 break; 722 break;
648 } 723 }
724 + window.myChart.destroy();
725 + window.myChart = new Chart(ctx, options_chart_1);
649 }); 726 });
650 727
651 var type2 = document.getElementById('type2'); 728 var type2 = document.getElementById('type2');
652 type2.addEventListener('click', function(){ 729 type2.addEventListener('click', function(){
653 - window.myChart.destroy();
654 - window.myChart = new Chart(ctx, options_chart_2);
655 switch(choosed_menu){ 730 switch(choosed_menu){
656 case 'payment2': 731 case 'payment2':
657 case 'payment3': 732 case 'payment3':
...@@ -664,33 +739,42 @@ type2.addEventListener('click', function(){ ...@@ -664,33 +739,42 @@ type2.addEventListener('click', function(){
664 box_name.innerHTML="# 결제 금액 기준"; 739 box_name.innerHTML="# 결제 금액 기준";
665 break; 740 break;
666 } 741 }
742 + window.myChart.destroy();
743 + window.myChart = new Chart(ctx, options_chart_2);
667 }); 744 });
668 745
669 function get_date_keyword(){ 746 function get_date_keyword(){
747 + menu_name.innerHTML="특정 기간의 문자 키워드 추출 중...";
670 keyword3.style="text-decoration:line-through"; 748 keyword3.style="text-decoration:line-through";
671 choosed_menu="keyword3"; 749 choosed_menu="keyword3";
672 keywordspace.style="display:none"; 750 keywordspace.style="display:none";
751 + choicespace.style="display:none";
673 chartspace.style="display:none"; 752 chartspace.style="display:none";
674 keyword1space.style="display:none"; 753 keyword1space.style="display:none";
675 keyword2space.style="display:none"; 754 keyword2space.style="display:none";
676 keyword3space.style="display:none"; 755 keyword3space.style="display:none";
677 between_submit.disabled=true; 756 between_submit.disabled=true;
678 keyword4space.style="display:none"; 757 keyword4space.style="display:none";
758 + payment6space.style="display:none";
759 + payment7space.style="display:none";
760 + payment8space.style="display:none";
761 + payment9space.style="display:none";
679 paymentspace.style="display:none"; 762 paymentspace.style="display:none";
763 + payment1space.style="display:none";
680 764
681 myList3.clear(); 765 myList3.clear();
682 keyword_between_list.length=0; 766 keyword_between_list.length=0;
683 keyword_between_count.length=0; 767 keyword_between_count.length=0;
684 768
685 - date_start=document.getElementById('between_date_start').value+' 00:00:00'; 769 + keyword_date_start=document.getElementById('between_date_start').value+' 00:00:00';
686 - date_end=document.getElementById('between_date_end').value+' 23:59:59'; 770 + keyword_date_end=document.getElementById('between_date_end').value+' 23:59:59';
687 771
688 let option_between = { 772 let option_between = {
689 mode: 'text', 773 mode: 'text',
690 pythonPath: 'py', 774 pythonPath: 'py',
691 pythonOptions: ['-3.6'], 775 pythonOptions: ['-3.6'],
692 scriptPath: '', 776 scriptPath: '',
693 - args: [date_start, date_end], 777 + args: [keyword_date_start, keyword_date_end],
694 encoding: 'utf8' 778 encoding: 'utf8'
695 }; 779 };
696 780
...@@ -703,12 +787,11 @@ function get_date_keyword(){ ...@@ -703,12 +787,11 @@ function get_date_keyword(){
703 keyword_between_list.push(data_temp[0]); 787 keyword_between_list.push(data_temp[0]);
704 keyword_between_count.push(data_temp[1]); 788 keyword_between_count.push(data_temp[1]);
705 } 789 }
706 - menu_name.innerHTML="특정 기간의 문자 키워드"; 790 + changeLabelText(keyword_between_list,"언급 횟수",keyword_between_count,[],"",[],"특정 기간의 문자 키워드","특정 기간의 문자 키워드 순위 / "+keyword_date_start.split(' ')[0]+" ~ "+keyword_date_end.split(' ')[0],"# 언급 횟수");
707 - options_chart_1.options.title.text="특정 기간의 문자 키워드"; 791 +
708 - options_chart_1.data.labels=keyword_between_list;
709 - options_chart_1.data.datasets[0].label="언급 횟수";
710 - options_chart_1.data.datasets[0].data=keyword_between_count;
711 window.myChart.destroy(); 792 window.myChart.destroy();
793 + document.getElementById("myChart").height="350";
794 + document.getElementById("chart-area").style="height:380px;";
712 window.myChart = new Chart(ctx, options_chart_1); 795 window.myChart = new Chart(ctx, options_chart_1);
713 chartspace.style="display:inline"; 796 chartspace.style="display:inline";
714 //cc.innerHTML="[done] recent Keyword"; 797 //cc.innerHTML="[done] recent Keyword";
...@@ -720,23 +803,30 @@ function get_date_keyword(){ ...@@ -720,23 +803,30 @@ function get_date_keyword(){
720 803
721 function get_number_push(){ 804 function get_number_push(){
722 number.push(document.getElementById('number').value); 805 number.push(document.getElementById('number').value);
723 - keyword4_list.innerHTML=number; 806 + keyword4_list.innerHTML=number.join('<br>');
724 } 807 }
725 function get_number_pop(){ 808 function get_number_pop(){
726 number.splice(number.indexOf(document.getElementById('number').value),1); 809 number.splice(number.indexOf(document.getElementById('number').value),1);
727 - keyword4_list.innerHTML=number; 810 + keyword4_list.innerHTML=number.join('<br>');
728 } 811 }
729 function get_number_keyword(){ 812 function get_number_keyword(){
813 + menu_name.innerHTML="특정 연락처와의 문자 키워드 추출 중...";
730 keyword4.style="text-decoration:line-through"; 814 keyword4.style="text-decoration:line-through";
731 choosed_menu="keyword4"; 815 choosed_menu="keyword4";
732 keywordspace.style="display:none"; 816 keywordspace.style="display:none";
817 + choicespace.style="display:none";
733 chartspace.style="display:none"; 818 chartspace.style="display:none";
734 keyword1space.style="display:none"; 819 keyword1space.style="display:none";
735 keyword2space.style="display:none"; 820 keyword2space.style="display:none";
736 keyword3space.style="display:none"; 821 keyword3space.style="display:none";
737 keyword4space.style="display:none"; 822 keyword4space.style="display:none";
823 + payment6space.style="display:none";
824 + payment7space.style="display:none";
825 + payment8space.style="display:none";
826 + payment9space.style="display:none";
738 with_submit.disabled=true; 827 with_submit.disabled=true;
739 paymentspace.style="display:none"; 828 paymentspace.style="display:none";
829 + payment1space.style="display:none";
740 830
741 myList4.clear(); 831 myList4.clear();
742 keyword_with_list.length=0; 832 keyword_with_list.length=0;
...@@ -760,12 +850,11 @@ function get_number_keyword(){ ...@@ -760,12 +850,11 @@ function get_number_keyword(){
760 keyword_with_list.push(data_temp[0]); 850 keyword_with_list.push(data_temp[0]);
761 keyword_with_count.push(data_temp[1]); 851 keyword_with_count.push(data_temp[1]);
762 } 852 }
763 - menu_name.innerHTML="특정 연락처와의 문자 키워드"; 853 + changeLabelText(keyword_with_list,"언급 횟수",keyword_with_count,[],"",[],"특정 연락처와의 문자 키워드","특정 연락처와의 문자 키워드 순위", "# 언급 횟수");
764 - options_chart_1.options.title.text="특정 연락처와의 문자 키워드"; 854 +
765 - options_chart_1.data.labels=keyword_with_list;
766 - options_chart_1.data.datasets[0].label="언급 횟수";
767 - options_chart_1.data.datasets[0].data=keyword_with_count;
768 window.myChart.destroy(); 855 window.myChart.destroy();
856 + document.getElementById("myChart").height="350";
857 + document.getElementById("chart-area").style="height:380px;";
769 window.myChart = new Chart(ctx, options_chart_1); 858 window.myChart = new Chart(ctx, options_chart_1);
770 chartspace.style="display:inline"; 859 chartspace.style="display:inline";
771 //cc.innerHTML="[done] recent Keyword"; 860 //cc.innerHTML="[done] recent Keyword";
...@@ -775,17 +864,57 @@ function get_number_keyword(){ ...@@ -775,17 +864,57 @@ function get_number_keyword(){
775 //connection.end(); 864 //connection.end();
776 } 865 }
777 866
867 +
868 +function get_paylist_date_payment(){
869 + keywordspace.style="display:none";
870 + choicespace.style="display:none";
871 + chartspace.style="display:none";
872 + keyword1space.style="display:none";
873 + keyword2space.style="display:none";
874 + keyword3space.style="display:none";
875 + keyword4space.style="display:none";
876 + payment6space.style="display:none";
877 + payment7space.style="display:none";
878 + payment8space.style="display:none";
879 + payment9space.style="display:none";
880 + paymentspace.style="display:none";
881 + payment1space.style="display:inline";
882 +
883 + myList5_1.clear();
884 + values_payment_list_between.length=0;
885 +
886 + paylist_date_start=document.getElementById('between_paylist_date_start').value+' 00:00:00';
887 + paylist_date_end=document.getElementById('between_paylist_date_end').value+' 23:59:59';
888 +
889 + for(var i=0;i<values_payment_list_all.length;i++){
890 + if(values_payment_list_all[i].date>paylist_date_end||values_payment_list_all[i].date<paylist_date_start)
891 + continue;
892 + else{
893 + var data_temp=[];
894 + data_temp.push(values_payment_list_all[i].bname);
895 + data_temp.push(values_payment_list_all[i].price);
896 + data_temp.push(values_payment_list_all[i].sname);
897 + data_temp.push(values_payment_list_all[i].payment);
898 + data_temp.push(values_payment_list_all[i].payment_);
899 + data_temp.push(values_payment_list_all[i].amount);
900 + data_temp.push(values_payment_list_all[i].date);
901 + values_payment_list_between.push({bname:data_temp[0], price:data_temp[1], sname:data_temp[2], payment:data_temp[3], payment_:data_temp[4], amount:data_temp[5], date:data_temp[6]});
902 + }
903 + }
904 + menu_name.innerHTML="특정 기간의 결제문자 목록 / "+paylist_date_start.split(' ')[0]+" ~ "+paylist_date_end.split(' ')[0];
905 + myList5_1 = new List("payment1space", options_list_pay, values_payment_list_between);
906 +}
907 +
778 function get_amount_date_payment(){ 908 function get_amount_date_payment(){
779 chartspaceview(); 909 chartspaceview();
910 +
780 type1.innerHTML="# 결제 금액"; 911 type1.innerHTML="# 결제 금액";
781 type2.innerHTML="# 누적 결제 금액"; 912 type2.innerHTML="# 누적 결제 금액";
782 choicespace.style="display:inline"; 913 choicespace.style="display:inline";
783 - box_name.innerHTML="# 결제 금액";
784 choosed_menu="payment3"; 914 choosed_menu="payment3";
785 915
786 date_start=document.getElementById('between_amount_date_start').value+' 00:00:00'; 916 date_start=document.getElementById('between_amount_date_start').value+' 00:00:00';
787 date_end=document.getElementById('between_amount_date_end').value+' 23:59:59'; 917 date_end=document.getElementById('between_amount_date_end').value+' 23:59:59';
788 - console.log(date_start, date_end);
789 918
790 payment_3_list.length=0; 919 payment_3_list.length=0;
791 payment_3_count.length=0; 920 payment_3_count.length=0;
...@@ -813,33 +942,30 @@ function get_amount_date_payment(){ ...@@ -813,33 +942,30 @@ function get_amount_date_payment(){
813 payment_4_list.push(date); 942 payment_4_list.push(date);
814 payment_4_count.push(sum); 943 payment_4_count.push(sum);
815 } 944 }
945 +
946 + changeLabelText(payment_3_list,"결제 금액",payment_3_count,payment_4_list,"누적 결제 금액",payment_4_count,"특정 기간의 결제 금액 통계","특정 기간의 결제 금액 통계 / "+date_start.split(' ')[0]+" ~ "+date_end.split(' ')[0],"# 결제 금액");
947 +
948 + window.myChart.destroy();
949 + document.getElementById("myChart").height="350";
950 + document.getElementById("chart-area").style="height:380px;";
951 + window.myChart = new Chart(ctx, options_chart_1);
816 } 952 }
817 else 953 else
818 cc.innerHTML='Error-query-#payment_3-2'+err; 954 cc.innerHTML='Error-query-#payment_3-2'+err;
819 }) 955 })
820 -
821 - menu_name.innerHTML="특정 기간의 결제 금액 통계";
822 - options_chart_1.options.title.text="특정 기간의 결제 금액 통계";
823 - options_chart_1.data.labels=payment_3_list;
824 - options_chart_1.data.datasets[0].label="결제 금액";
825 - options_chart_1.data.datasets[0].data=payment_3_count;
826 - options_charts_2.title.text="특정 기간의 누적 결제 금액 통계";
827 - options_chart_2.data.labels=payment_4_list;
828 - options_chart_2.data.datasets[0].label="누적 결제 금액";
829 - options_chart_2.data.datasets[0].data=payment_4_count;
830 - window.myChart.destroy();
831 } 956 }
832 957
833 function get_payment_date_payment(){ 958 function get_payment_date_payment(){
834 chartspaceview(); 959 chartspaceview();
960 + choosed_menu="payment5";
835 961
836 - date_start=document.getElementById('between_payment_date_start').value+' 00:00:00'; 962 + payment_date_start=document.getElementById('between_payment_date_start').value+' 00:00:00';
837 - date_end=document.getElementById('between_payment_date_end').value+' 23:59:59'; 963 + payment_date_end=document.getElementById('between_payment_date_end').value+' 23:59:59';
838 964
839 payment_6_list.length=0; 965 payment_6_list.length=0;
840 payment_6_count.length=0; 966 payment_6_count.length=0;
841 967
842 - connection.query("drop table if exists sms_bank_hour; create table sms_bank_hour(hour int not null, smscount int, primary key(hour)); set @hour:=-1; insert into sms_bank_hour(hour, smscount) (select (@hour:=@hour+1) 'hour', (select count(*) 'smscount' from sms_bank where date between ? and ? and hour(date)=@hour) 'count' from sms where @hour<23);",[date_start, date_end], function(err, rows, fields){ 968 + connection.query("drop table if exists sms_bank_hour; create table sms_bank_hour(hour int not null, smscount int, primary key(hour)); set @hour:=-1; insert into sms_bank_hour(hour, smscount) (select (@hour:=@hour+1) 'hour', (select count(*) 'smscount' from sms_bank where date between ? and ? and hour(date)=@hour) 'count' from sms where @hour<23);",[payment_date_start, payment_date_end], function(err, rows, fields){
843 if(!err){ 969 if(!err){
844 connection.query("select * from sms_bank_hour order by hour;",function(err, rows, fields){ 970 connection.query("select * from sms_bank_hour order by hour;",function(err, rows, fields){
845 if(!err){ 971 if(!err){
...@@ -849,6 +975,13 @@ function get_payment_date_payment(){ ...@@ -849,6 +975,13 @@ function get_payment_date_payment(){
849 payment_6_list.push(hour); 975 payment_6_list.push(hour);
850 payment_6_count.push(count); 976 payment_6_count.push(count);
851 } 977 }
978 +
979 + changeLabelText(payment_6_list,"결제 횟수",payment_6_count,[],"",[],"특정 기간의 결제 시간대","특정 기간의 결제 시간대 / "+payment_date_start.split(' ')[0]+" ~ "+payment_date_end.split(' ')[0],"# 결제 횟수");
980 +
981 + window.myChart.destroy();
982 + document.getElementById("myChart").height="350";
983 + document.getElementById("chart-area").style="height:380px;";
984 + window.myChart = new Chart(ctx, options_chart_1);
852 } 985 }
853 else 986 else
854 cc.innerHTML='Error-quert-#payment_5-1'; 987 cc.innerHTML='Error-quert-#payment_5-1';
...@@ -857,32 +990,26 @@ function get_payment_date_payment(){ ...@@ -857,32 +990,26 @@ function get_payment_date_payment(){
857 else 990 else
858 cc.innerHTML='Error-query-#payment_5'; 991 cc.innerHTML='Error-query-#payment_5';
859 }) 992 })
860 -
861 - menu_name.innerHTML="특정 기간의 결제 시간대";
862 - options_chart_1.options.title.text="특정 기간의 결제 시간대";
863 - options_chart_1.data.labels=payment_6_list;
864 - options_chart_1.data.datasets[0].label="결제 횟수";
865 - options_chart_1.data.datasets[0].data=payment_6_count;
866 - window.myChart.destroy();
867 } 993 }
868 994
869 function get_card_date_payment(){ 995 function get_card_date_payment(){
870 chartspaceview(); 996 chartspaceview();
997 + choosed_menu="payment7";
998 +
871 type1.innerHTML="# 결제 횟수 기준"; 999 type1.innerHTML="# 결제 횟수 기준";
872 type2.innerHTML="# 결제 금액 기준"; 1000 type2.innerHTML="# 결제 금액 기준";
873 choicespace.style="display:inline"; 1001 choicespace.style="display:inline";
874 - box_name.innerHTML="# 결제 횟수 기준";
875 choosed_menu="payment7"; 1002 choosed_menu="payment7";
876 1003
877 - date_start=document.getElementById('between_card_date_start').value+' 00:00:00'; 1004 + card_date_start=document.getElementById('between_card_date_start').value+' 00:00:00';
878 - date_end=document.getElementById('between_card_date_end').value+' 23:59:59'; 1005 + card_date_end=document.getElementById('between_card_date_end').value+' 23:59:59';
879 1006
880 payment_9_list.length=0; 1007 payment_9_list.length=0;
881 payment_9_count.length=0; 1008 payment_9_count.length=0;
882 payment_10_list.length=0; 1009 payment_10_list.length=0;
883 payment_10_count.length=0; 1010 payment_10_count.length=0;
884 1011
885 - connection.query("select bname, count(*) 'count' from sms_bank where date between ? and ? group by bname order by count(*) desc;",[date_start, date_end], function(err, rows, fields){ 1012 + connection.query("select bname, count(*) 'count' from sms_bank where date between ? and ? group by bname order by count(*) desc;",[card_date_start, card_date_end], function(err, rows, fields){
886 if(!err){ 1013 if(!err){
887 for(var i=0;i<rows.length;i++){ 1014 for(var i=0;i<rows.length;i++){
888 var bname=rows[i].bname; 1015 var bname=rows[i].bname;
...@@ -895,7 +1022,7 @@ function get_card_date_payment(){ ...@@ -895,7 +1022,7 @@ function get_card_date_payment(){
895 cc.innerHTML='Error-query-#payment_7-1'; 1022 cc.innerHTML='Error-query-#payment_7-1';
896 }) 1023 })
897 1024
898 - connection.query("select bname, sum(price) 'sum' from sms_bank where date between ? and ? group by bname order by sum(price) desc;",[date_start, date_end], function(err, rows, fields){ 1025 + connection.query("select bname, sum(price) 'sum' from sms_bank where date between ? and ? group by bname order by sum(price) desc;",[card_date_start, card_date_end], function(err, rows, fields){
899 if(!err){ 1026 if(!err){
900 for(var i=0;i<rows.length;i++){ 1027 for(var i=0;i<rows.length;i++){
901 var bname=rows[i].bname; 1028 var bname=rows[i].bname;
...@@ -903,40 +1030,37 @@ function get_card_date_payment(){ ...@@ -903,40 +1030,37 @@ function get_card_date_payment(){
903 payment_10_list.push(bname); 1030 payment_10_list.push(bname);
904 payment_10_count.push(sum); 1031 payment_10_count.push(sum);
905 } 1032 }
1033 +
1034 + changeLabelText_hor(payment_9_list,"결제 횟수",payment_9_count,payment_10_list,"결제 금액",payment_10_count,"특정 기간의 카드 이용 순위","특정 기간의 카드 이용 순위 / "+card_date_start.split(' ')[0]+" ~ "+card_date_end.split(' ')[0],"# 결제 횟수 기준");
1035 +
1036 + window.myChart.destroy();
1037 + document.getElementById("myChart").height="1000";
1038 + document.getElementById("chart-area").style="height:1030px;";
1039 + window.myChart = new Chart(ctx, options_chart_1);
906 } 1040 }
907 else 1041 else
908 cc.innerHTML='Error-query-#payment_7-2'; 1042 cc.innerHTML='Error-query-#payment_7-2';
909 }) 1043 })
910 -
911 - menu_name.innerHTML="특정 기간의 카드 이용 순위";
912 - options_chart_1.options.title.text="특정 기간의 카드 이용 순위";
913 - options_chart_1.data.labels=payment_9_list;
914 - options_chart_1.data.datasets[0].label="결제 횟수";
915 - options_chart_1.data.datasets[0].data=payment_9_count;
916 - options_charts_2.title.text="특정 기간의 카드 이용 순위";
917 - options_chart_2.data.labels=payment_10_list;
918 - options_chart_2.data.datasets[0].label="결제 금액";
919 - options_chart_2.data.datasets[0].data=payment_10_count;
920 - window.myChart.destroy();
921 } 1044 }
922 1045
923 function get_store_date_payment(){ 1046 function get_store_date_payment(){
924 chartspaceview(); 1047 chartspaceview();
1048 + choosed_menu="payment9";
1049 +
925 type1.innerHTML="# 결제 횟수 기준"; 1050 type1.innerHTML="# 결제 횟수 기준";
926 type2.innerHTML="# 결제 금액 기준"; 1051 type2.innerHTML="# 결제 금액 기준";
927 choicespace.style="display:inline"; 1052 choicespace.style="display:inline";
928 - box_name.innerHTML="# 결제 횟수 기준";
929 choosed_menu="payment9"; 1053 choosed_menu="payment9";
930 1054
931 - date_start=document.getElementById('between_store_date_start').value+' 00:00:00'; 1055 + store_date_start=document.getElementById('between_store_date_start').value+' 00:00:00';
932 - date_end=document.getElementById('between_store_date_end').value+' 23:59:59'; 1056 + store_date_end=document.getElementById('between_store_date_end').value+' 23:59:59';
933 1057
934 payment_13_list.length=0; 1058 payment_13_list.length=0;
935 payment_13_count.length=0; 1059 payment_13_count.length=0;
936 payment_14_list.length=0; 1060 payment_14_list.length=0;
937 payment_14_count.length=0; 1061 payment_14_count.length=0;
938 1062
939 - connection.query("select sname, count(*) 'count' from sms_bank where date between ? and ? group by sname order by count(*) desc;",[date_start, date_end], function(err, rows, fields){ 1063 + connection.query("select sname, count(*) 'count' from sms_bank where date between ? and ? group by sname order by count(*) desc;",[store_date_start, store_date_end], function(err, rows, fields){
940 if(!err){ 1064 if(!err){
941 for(var i=0;i<rows.length;i++){ 1065 for(var i=0;i<rows.length;i++){
942 var sname=rows[i].sname; 1066 var sname=rows[i].sname;
...@@ -949,7 +1073,7 @@ function get_store_date_payment(){ ...@@ -949,7 +1073,7 @@ function get_store_date_payment(){
949 cc.innerHTML='Error-query-#payment_9-1'; 1073 cc.innerHTML='Error-query-#payment_9-1';
950 }) 1074 })
951 1075
952 - connection.query("select sname, sum(price) 'sum' from sms_bank where date between ? and ? group by sname order by sum(price) desc;",[date_start, date_end], function(err, rows, fields){ 1076 + connection.query("select sname, sum(price) 'sum' from sms_bank where date between ? and ? group by sname order by sum(price) desc;",[store_date_start, store_date_end], function(err, rows, fields){
953 if(!err){ 1077 if(!err){
954 for(var i=0;i<rows.length;i++){ 1078 for(var i=0;i<rows.length;i++){
955 var sname=rows[i].sname; 1079 var sname=rows[i].sname;
...@@ -957,21 +1081,17 @@ function get_store_date_payment(){ ...@@ -957,21 +1081,17 @@ function get_store_date_payment(){
957 payment_14_list.push(sname); 1081 payment_14_list.push(sname);
958 payment_14_count.push(sum); 1082 payment_14_count.push(sum);
959 } 1083 }
1084 +
1085 + changeLabelText_hor(payment_13_list,"결제 횟수",payment_13_count,payment_14_list,"결제 금액",payment_14_count,"특정 기간의 사용처 순위","특정 기간의 사용처 순위 / "+store_date_start.split(' ')[0]+" ~ "+store_date_end.split(' ')[0],"# 결제 횟수 기준");
1086 +
1087 + window.myChart.destroy();
1088 + document.getElementById("myChart").height="1000";
1089 + document.getElementById("chart-area").style="height:1030px;";
1090 + window.myChart = new Chart(ctx, options_chart_1);
960 } 1091 }
961 else 1092 else
962 cc.innerHTML='Error-query-#payment_9-2'; 1093 cc.innerHTML='Error-query-#payment_9-2';
963 }) 1094 })
964 -
965 - menu_name.innerHTML="특정 기간의 사용처 순위";
966 - options_chart_1.options.title.text="특정 기간의 사용처 순위";
967 - options_chart_1.data.labels=payment_13_list;
968 - options_chart_1.data.datasets[0].label="결제 횟수";
969 - options_chart_1.data.datasets[0].data=payment_13_count;
970 - options_charts_2.title.text="특정 기간의 사용처 순위";
971 - options_chart_2.data.labels=payment_14_list;
972 - options_chart_2.data.datasets[0].label="결제 금액";
973 - options_chart_2.data.datasets[0].data=payment_14_count;
974 - window.myChart.destroy();
975 } 1095 }
976 1096
977 /* 1097 /*
...@@ -995,11 +1115,10 @@ canvas.onclick=function(event){ ...@@ -995,11 +1115,10 @@ canvas.onclick=function(event){
995 var idx=activePoints[0]['_index']; 1115 var idx=activePoints[0]['_index'];
996 var label=chartData.labels[idx]; 1116 var label=chartData.labels[idx];
997 var value=chartData.datasets[0].data[idx]; 1117 var value=chartData.datasets[0].data[idx];
998 - console.log(chartData); 1118 +
999 if(choosed_menu=="keyword1"){ 1119 if(choosed_menu=="keyword1"){
1000 chartspace.style="display:none"; 1120 chartspace.style="display:none";
1001 keyword1space.style="display:inline"; 1121 keyword1space.style="display:inline";
1002 - keyword2space.style="display:none";
1003 myList1.clear(); 1122 myList1.clear();
1004 values_list_1.length=0; 1123 values_list_1.length=0;
1005 1124
...@@ -1019,12 +1138,11 @@ canvas.onclick=function(event){ ...@@ -1019,12 +1138,11 @@ canvas.onclick=function(event){
1019 } 1138 }
1020 } 1139 }
1021 } 1140 }
1022 - menu_name.innerHTML="최근 1개월 키워드 순위 / "+label; 1141 + menu_name.innerHTML="최근 1개월의 문자 키워드 순위 / "+label;
1023 myList1 = new List("keyword1space", options_list, values_list_1); 1142 myList1 = new List("keyword1space", options_list, values_list_1);
1024 } 1143 }
1025 else if(choosed_menu=="keyword2"){ 1144 else if(choosed_menu=="keyword2"){
1026 chartspace.style="display:none"; 1145 chartspace.style="display:none";
1027 - keyword1space.style="display:none";
1028 keyword2space.style="display:inline"; 1146 keyword2space.style="display:inline";
1029 myList2.clear(); 1147 myList2.clear();
1030 values_list_all.length=0; 1148 values_list_all.length=0;
...@@ -1045,22 +1163,18 @@ canvas.onclick=function(event){ ...@@ -1045,22 +1163,18 @@ canvas.onclick=function(event){
1045 } 1163 }
1046 } 1164 }
1047 } 1165 }
1048 - menu_name.innerHTML="전체 기간의 키워드 순위 / "+label; 1166 + menu_name.innerHTML="전체 기간의 문자 키워드 순위 / "+label;
1049 myList2 = new List("keyword2space", options_list, values_list_all); 1167 myList2 = new List("keyword2space", options_list, values_list_all);
1050 } 1168 }
1051 else if(choosed_menu=="keyword3"){ 1169 else if(choosed_menu=="keyword3"){
1052 chartspace.style="display:none"; 1170 chartspace.style="display:none";
1053 - keyword1space.style="display:none";
1054 - keyword2space.style="display:none";
1055 keyword3space.style="display:inline"; 1171 keyword3space.style="display:inline";
1056 - keyword4space.style="display:none";
1057 -
1058 myList3.clear(); 1172 myList3.clear();
1059 values_list_between.length=0; 1173 values_list_between.length=0;
1060 1174
1061 for(var i=0;i<values_list.length;i++){ 1175 for(var i=0;i<values_list.length;i++){
1062 var keyword_str=values_list[i].keyword; 1176 var keyword_str=values_list[i].keyword;
1063 - if(!keyword_str||values_list[i].date>date_end||values_list[i].date<date_start) 1177 + if(!keyword_str||values_list[i].date>keyword_date_end||values_list[i].date<keyword_date_start)
1064 continue; 1178 continue;
1065 else{ 1179 else{
1066 if(keyword_str.includes(label)){ 1180 if(keyword_str.includes(label)){
...@@ -1074,14 +1188,11 @@ canvas.onclick=function(event){ ...@@ -1074,14 +1188,11 @@ canvas.onclick=function(event){
1074 } 1188 }
1075 } 1189 }
1076 } 1190 }
1077 - menu_name.innerHTML="특정 기간의 키워드 순위 / "+label; 1191 + menu_name.innerHTML="특정 기간의 문자 키워드 순위 / "+label;
1078 myList3 = new List("keyword3space", options_list, values_list_between); 1192 myList3 = new List("keyword3space", options_list, values_list_between);
1079 } 1193 }
1080 else if(choosed_menu=="keyword4"){ 1194 else if(choosed_menu=="keyword4"){
1081 chartspace.style="display:none"; 1195 chartspace.style="display:none";
1082 - keyword1space.style="display:none";
1083 - keyword2space.style="display:none";
1084 - keyword3space.style="display:none";
1085 keyword4space.style="display:inline"; 1196 keyword4space.style="display:inline";
1086 1197
1087 myList4.clear(); 1198 myList4.clear();
...@@ -1105,9 +1216,117 @@ canvas.onclick=function(event){ ...@@ -1105,9 +1216,117 @@ canvas.onclick=function(event){
1105 } 1216 }
1106 } 1217 }
1107 } 1218 }
1108 - menu_name.innerHTML="특정 연락처와의 키워드 순위 / "+label; 1219 + menu_name.innerHTML="특정 연락처와의 문자 키워드 순위 / "+label;
1109 myList4 = new List("keyword4space", options_list, values_list_with); 1220 myList4 = new List("keyword4space", options_list, values_list_with);
1110 } 1221 }
1222 + else if(choosed_menu=="payment6"){
1223 + choicespace.style="display:none";
1224 + chartspace.style="display:none";
1225 + payment6space.style="display:inline";
1226 +
1227 + myList6.clear();
1228 + values_list_card_rank.length=0;
1229 +
1230 + for(var i=0;i<values_payment_list_all.length;i++){
1231 + var card_str=values_payment_list_all[i].bname.replace(" ","");
1232 + if(!card_str)
1233 + continue;
1234 + else{
1235 + if(card_str==label){
1236 + var data_temp=[];
1237 + data_temp.push(values_payment_list_all[i].bname);
1238 + data_temp.push(values_payment_list_all[i].price);
1239 + data_temp.push(values_payment_list_all[i].sname);
1240 + data_temp.push(values_payment_list_all[i].payment);
1241 + data_temp.push(values_payment_list_all[i].date);
1242 + values_list_card_rank.push({bname:data_temp[0], price:data_temp[1], sname:data_temp[2], payment:data_temp[3], date:data_temp[4]});
1243 + }
1244 + }
1245 + }
1246 + menu_name.innerHTML="전체 기간의 카드 이용 순위 / "+label;
1247 + myList6 = new List("payment6space", options_list_pay, values_list_card_rank);
1248 + }
1249 + else if(choosed_menu=="payment7"){
1250 + choicespace.style="display:none";
1251 + chartspace.style="display:none";
1252 + payment7space.style="display:inline";
1253 +
1254 + myList7.clear();
1255 + values_list_card_rank_between.length=0;
1256 +
1257 + for(var i=0;i<values_payment_list_all.length;i++){
1258 + var card_str=values_payment_list_all[i].bname.replace(" ","");
1259 + if(!card_str||values_payment_list_all[i].date>card_date_end||values_payment_list_all[i].date<card_date_start)
1260 + continue;
1261 + else{
1262 + if(card_str==label){
1263 + var data_temp=[];
1264 + data_temp.push(values_payment_list_all[i].bname);
1265 + data_temp.push(values_payment_list_all[i].price);
1266 + data_temp.push(values_payment_list_all[i].sname);
1267 + data_temp.push(values_payment_list_all[i].payment);
1268 + data_temp.push(values_payment_list_all[i].date);
1269 + values_list_card_rank_between.push({bname:data_temp[0], price:data_temp[1], sname:data_temp[2], payment:data_temp[3], date:data_temp[4]});
1270 + }
1271 + }
1272 + }
1273 + menu_name.innerHTML="특정 기간의 카드 이용 순위 / "+label;
1274 + myList7 = new List("payment7space", options_list_pay, values_list_card_rank_between);
1275 + }
1276 + else if(choosed_menu=="payment8"){
1277 + choicespace.style="display:none";
1278 + chartspace.style="display:none";
1279 + payment8space.style="display:inline";
1280 +
1281 + myList8.clear();
1282 + values_list_store_rank.length=0;
1283 +
1284 + for(var i=0;i<values_payment_list_all.length;i++){
1285 + var store_str=values_payment_list_all[i].sname.replace(" ","");
1286 + if(!store_str)
1287 + continue;
1288 + else{
1289 + if(store_str==label.replace(" ","")){
1290 + var data_temp=[];
1291 + data_temp.push(values_payment_list_all[i].bname);
1292 + data_temp.push(values_payment_list_all[i].price);
1293 + data_temp.push(values_payment_list_all[i].sname);
1294 + data_temp.push(values_payment_list_all[i].payment);
1295 + data_temp.push(values_payment_list_all[i].date);
1296 + values_list_store_rank.push({bname:data_temp[0], price:data_temp[1], sname:data_temp[2], payment:data_temp[3], date:data_temp[4]});
1297 + }
1298 + }
1299 + }
1300 + menu_name.innerHTML="전체 기간의 사용처 순위 / "+label;
1301 + myList8 = new List("payment8space", options_list_pay, values_list_store_rank);
1302 + }
1303 + else if(choosed_menu=="payment9"){
1304 + choicespace.style="display:none";
1305 + chartspace.style="display:none";
1306 + payment9space.style="display:inline";
1307 +
1308 + myList9.clear();
1309 + values_list_store_rank_between.length=0;
1310 +
1311 + for(var i=0;i<values_payment_list_all.length;i++){
1312 + var store_str=values_payment_list_all[i].sname.replace(" ","");
1313 + if(!store_str||values_payment_list_all[i].date>store_date_end||values_payment_list_all[i].date<store_date_start)
1314 + continue;
1315 + else{
1316 + if(store_str==label.replace(" ","")){
1317 + var data_temp=[];
1318 + data_temp.push(values_payment_list_all[i].bname);
1319 + data_temp.push(values_payment_list_all[i].price);
1320 + data_temp.push(values_payment_list_all[i].sname);
1321 + data_temp.push(values_payment_list_all[i].payment);
1322 + data_temp.push(values_payment_list_all[i].date);
1323 + values_list_store_rank_between.push({bname:data_temp[0], price:data_temp[1], sname:data_temp[2], payment:data_temp[3], date:data_temp[4]});
1324 + }
1325 + }
1326 + }
1327 + menu_name.innerHTML="특정 기간의 사용처 순위 / "+label;
1328 + myList9 = new List("payment9space", options_list_pay, values_list_store_rank_between);
1329 + }
1111 }; 1330 };
1112 1331
1113 var filter0List=[]; 1332 var filter0List=[];
...@@ -1116,49 +1335,58 @@ var filter2List=[]; ...@@ -1116,49 +1335,58 @@ var filter2List=[];
1116 var filter3List=[]; 1335 var filter3List=[];
1117 var filter4List=[]; 1336 var filter4List=[];
1118 var filter5List=[]; 1337 var filter5List=[];
1338 +var filter6List=[];
1119 var filter0_element=document.getElementsByClassName("filter0"); 1339 var filter0_element=document.getElementsByClassName("filter0");
1120 var filter1_element=document.getElementsByClassName("filter1"); 1340 var filter1_element=document.getElementsByClassName("filter1");
1121 var filter2_element=document.getElementsByClassName("filter2"); 1341 var filter2_element=document.getElementsByClassName("filter2");
1122 var filter3_element=document.getElementsByClassName("filter3"); 1342 var filter3_element=document.getElementsByClassName("filter3");
1123 var filter4_element=document.getElementsByClassName("filter4"); 1343 var filter4_element=document.getElementsByClassName("filter4");
1124 var filter5_element=document.getElementsByClassName("filter5"); 1344 var filter5_element=document.getElementsByClassName("filter5");
1345 +var filter6_element=document.getElementsByClassName("filter6");
1125 1346
1126 function filter_listener(event){ 1347 function filter_listener(event){
1127 var data_value_temp=event.target.getAttribute('data_value'); 1348 var data_value_temp=event.target.getAttribute('data_value');
1128 var data_filter_temp="type_cs"; 1349 var data_filter_temp="type_cs";
1350 + var icon_temp=event.target.getAttribute('icon');
1129 var checked_temp=event.target.checked; 1351 var checked_temp=event.target.checked;
1130 1352
1131 - switch(event.target.id){ 1353 + switch(event.target.id.slice(0,7)){
1132 case "filter0": 1354 case "filter0":
1133 - filter_action(filter0List, checked_temp, data_filter_temp, data_value_temp, myList); 1355 + filter_action(filter0List, checked_temp, data_filter_temp, data_value_temp, icon_temp, myList);
1134 break; 1356 break;
1135 case "filter1": 1357 case "filter1":
1136 - filter_action(filter1List, checked_temp, data_filter_temp, data_value_temp, myList1); 1358 + filter_action(filter1List, checked_temp, data_filter_temp, data_value_temp, icon_temp, myList1);
1137 break; 1359 break;
1138 case "filter2": 1360 case "filter2":
1139 - filter_action(filter2List, checked_temp, data_filter_temp, data_value_temp, myList2); 1361 + filter_action(filter2List, checked_temp, data_filter_temp, data_value_temp, icon_temp, myList2);
1140 break; 1362 break;
1141 case "filter3": 1363 case "filter3":
1142 - filter_action(filter3List, checked_temp, data_filter_temp, data_value_temp, myList3); 1364 + filter_action(filter3List, checked_temp, data_filter_temp, data_value_temp, icon_temp, myList3);
1143 break; 1365 break;
1144 case "filter4": 1366 case "filter4":
1145 - filter_action(filter4List, checked_temp, data_filter_temp, data_value_temp, myList4); 1367 + filter_action(filter4List, checked_temp, data_filter_temp, data_value_temp, icon_temp, myList4);
1146 break; 1368 break;
1147 case "filter5": 1369 case "filter5":
1148 data_filter_temp=event.target.getAttribute('data_filter'); 1370 data_filter_temp=event.target.getAttribute('data_filter');
1149 - filter_action(filter5List, checked_temp, data_filter_temp, data_value_temp, myList5); 1371 + filter_action(filter5List, checked_temp, data_filter_temp, data_value_temp, icon_temp, myList5);
1372 + break;
1373 + case "filter6":
1374 + data_filter_temp=event.target.getAttribute('data_filter');
1375 + filter_action(filter6List, checked_temp, data_filter_temp, data_value_temp, icon_temp, myList5_1);
1150 break; 1376 break;
1151 } 1377 }
1152 } 1378 }
1153 -function filter_action(paramlist, checked_temp, filter_temp, value_temp, myList_temp){ 1379 +function filter_action(paramlist, checked_temp, filter_temp, value_temp, icon_temp, myList_temp){
1154 - var _filter_temp=filter_temp;
1155 if (checked_temp){ 1380 if (checked_temp){
1381 + document.getElementById(icon_temp).style="display:inline";
1382 +
1383 + paramlist.push(filter_temp);
1156 paramlist.push(value_temp); 1384 paramlist.push(value_temp);
1157 1385
1158 myList_temp.filter(function (item) { 1386 myList_temp.filter(function (item) {
1159 var check_all=true; 1387 var check_all=true;
1160 - for(var i=0;i<paramlist.length;i++){ 1388 + for(var i=0;i<paramlist.length;i=i+2){
1161 - if(item.values()[_filter_temp] !== paramlist[i]) 1389 + if(item.values()[paramlist[i]] !== paramlist[i+1])
1162 check_all=false; 1390 check_all=false;
1163 } 1391 }
1164 if(check_all) 1392 if(check_all)
...@@ -1168,12 +1396,14 @@ function filter_action(paramlist, checked_temp, filter_temp, value_temp, myList_ ...@@ -1168,12 +1396,14 @@ function filter_action(paramlist, checked_temp, filter_temp, value_temp, myList_
1168 }); 1396 });
1169 } 1397 }
1170 else{ 1398 else{
1171 - paramlist.splice(paramlist.indexOf(value_temp),1); 1399 + document.getElementById(icon_temp).style="display:none";
1400 +
1401 + paramlist.splice(paramlist.indexOf(value_temp)-1,2);
1172 1402
1173 myList_temp.filter(function (item) { 1403 myList_temp.filter(function (item) {
1174 var check_all=true; 1404 var check_all=true;
1175 - for(var i=0;i<paramlist.length;i++){ 1405 + for(var i=0;i<paramlist.length;i=i+2){
1176 - if(item.values()[_filter_temp] !== paramlist[i]) 1406 + if(item.values()[paramlist[i]] !== paramlist[i+1])
1177 check_all=false; 1407 check_all=false;
1178 } 1408 }
1179 if(check_all) 1409 if(check_all)
...@@ -1202,3 +1432,6 @@ for (var i = 0; i < filter4_element.length; i++) { ...@@ -1202,3 +1432,6 @@ for (var i = 0; i < filter4_element.length; i++) {
1202 for (var i = 0; i < filter5_element.length; i++) { 1432 for (var i = 0; i < filter5_element.length; i++) {
1203 filter5_element[i].addEventListener('click', filter_listener, false); 1433 filter5_element[i].addEventListener('click', filter_listener, false);
1204 } 1434 }
1435 +for (var i = 0; i < filter6_element.length; i++) {
1436 + filter6_element[i].addEventListener('click', filter_listener, false);
1437 +}
...\ No newline at end of file ...\ No newline at end of file
......