김예미

update menu1 - js mysql query async

...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <div id="menu_bar"> 16 <div id="menu_bar">
17 <ul id="menu"> 17 <ul id="menu">
18 <li class="menu1">통계 분석</li> 18 <li class="menu1">통계 분석</li>
19 - <li class="menu2" id="analysis1">최근 통계</li> 19 + <li class="menu2" id="analysis1">최근 6개월 통계</li>
20 <li class="menu2" id="analysis2">전체 통계</li> 20 <li class="menu2" id="analysis2">전체 통계</li>
21 <li class="menu2" id="analysis3">특정 기간 통계</li> 21 <li class="menu2" id="analysis3">특정 기간 통계</li>
22 <form name="dateForm" method="post" id="dateForm"> 22 <form name="dateForm" method="post" id="dateForm">
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 </form> 34 </form>
35 <li class="menu2" id="analysis4_list"></li> 35 <li class="menu2" id="analysis4_list"></li>
36 <li class="menu1">목록 분석</li> 36 <li class="menu1">목록 분석</li>
37 - <li class="menu2" id="list1">최근 목록</li> 37 + <li class="menu2" id="list1">최근 1달 목록</li>
38 <li class="menu2" id="list2">전체 목록</li> 38 <li class="menu2" id="list2">전체 목록</li>
39 <li class="menu2" id="list4">특정 기간 목록</li> 39 <li class="menu2" id="list4">특정 기간 목록</li>
40 <form name="dateForm" method="post" id="dateForm"> 40 <form name="dateForm" method="post" id="dateForm">
......
...@@ -144,9 +144,8 @@ connection.query('select MIN(date) "min", MAX(date) "max" from calllog;', functi ...@@ -144,9 +144,8 @@ connection.query('select MIN(date) "min", MAX(date) "max" from calllog;', functi
144 connection.query('drop table if exists calllog_month; create table calllog_month(date datetime not null, logcount int, callcount int, smscount int, durationsum int, primary key(date)); insert into calllog_month(date, callcount, durationsum) (select date_format(date, "%Y-%m-02 00:00:00"), count(*), sum(duration) from calllog where type in (1,2,3) group by date_format(date, "%Y-%m-02 00:00:00")); update calllog_month cm left join (select date_format(date, "%Y-%m-02 00:00:00") "date", count(*) "count" from calllog group by date_format(date, "%Y-%m-02 00:00:00")) temp on cm.date=temp.date set cm.logcount=temp.count, cm.smscount=cm.logcount-cm.callcount;', function(err, rows, fields){ 144 connection.query('drop table if exists calllog_month; create table calllog_month(date datetime not null, logcount int, callcount int, smscount int, durationsum int, primary key(date)); insert into calllog_month(date, callcount, durationsum) (select date_format(date, "%Y-%m-02 00:00:00"), count(*), sum(duration) from calllog where type in (1,2,3) group by date_format(date, "%Y-%m-02 00:00:00")); update calllog_month cm left join (select date_format(date, "%Y-%m-02 00:00:00") "date", count(*) "count" from calllog group by date_format(date, "%Y-%m-02 00:00:00")) temp on cm.date=temp.date set cm.logcount=temp.count, cm.smscount=cm.logcount-cm.callcount;', function(err, rows, fields){
145 if(err) 145 if(err)
146 cc.innerHTML='Error-#1'; 146 cc.innerHTML='Error-#1';
147 -}); 147 + else{
148 - 148 + connection.query('select * from calllog_month order by date DESC limit 6;', function(err, rows, fields){
149 -connection.query('select * from calllog_month order by date DESC limit 6;', function(err, rows, fields){
150 if(!err){ 149 if(!err){
151 for(var i=0;i<rows.length;i++){ 150 for(var i=0;i<rows.length;i++){
152 month_6.unshift(rows[i].date.toISOString().slice(0,7)); 151 month_6.unshift(rows[i].date.toISOString().slice(0,7));
...@@ -158,9 +157,9 @@ connection.query('select * from calllog_month order by date DESC limit 6;', func ...@@ -158,9 +157,9 @@ connection.query('select * from calllog_month order by date DESC limit 6;', func
158 } 157 }
159 else 158 else
160 cc.innerHTML='Error-#2'; 159 cc.innerHTML='Error-#2';
161 -}); 160 + });
162 161
163 -connection.query('select a.date, sum(b.logcount) "logcount", sum(b.callcount) "callcount", sum(b.smscount) "smscount", sum(b.durationsum) "durationsum" from (select * from calllog_month order by date DESC limit 6) a, (select * from calllog_month order by date DESC limit 6) b where a.date>=b.date group by date order by a.date;', function(err, rows, fields){ 162 + connection.query('select a.date, sum(b.logcount) "logcount", sum(b.callcount) "callcount", sum(b.smscount) "smscount", sum(b.durationsum) "durationsum" from (select * from calllog_month order by date DESC limit 6) a, (select * from calllog_month order by date DESC limit 6) b where a.date>=b.date group by date order by a.date;', function(err, rows, fields){
164 if(!err){ 163 if(!err){
165 for(var i=0;i<rows.length;i++){ 164 for(var i=0;i<rows.length;i++){
166 logcount_6nu.push(rows[i].logcount); 165 logcount_6nu.push(rows[i].logcount);
...@@ -171,9 +170,9 @@ connection.query('select a.date, sum(b.logcount) "logcount", sum(b.callcount) "c ...@@ -171,9 +170,9 @@ connection.query('select a.date, sum(b.logcount) "logcount", sum(b.callcount) "c
171 } 170 }
172 else 171 else
173 cc.innerHTML='Error-#3'; 172 cc.innerHTML='Error-#3';
174 -}); 173 + });
175 174
176 -connection.query('select * from calllog_month order by date;', function(err, rows, fields){ 175 + connection.query('select * from calllog_month order by date;', function(err, rows, fields){
177 if(!err){ 176 if(!err){
178 for(var i=0;i<rows.length;i++){ 177 for(var i=0;i<rows.length;i++){
179 month.push(rows[i].date.toISOString().slice(0,7)); 178 month.push(rows[i].date.toISOString().slice(0,7));
...@@ -185,9 +184,9 @@ connection.query('select * from calllog_month order by date;', function(err, row ...@@ -185,9 +184,9 @@ connection.query('select * from calllog_month order by date;', function(err, row
185 } 184 }
186 else 185 else
187 cc.innerHTML='Error-#4'; 186 cc.innerHTML='Error-#4';
188 -}); 187 + });
189 188
190 -connection.query('select a.date, sum(b.logcount) "logcount", sum(b.callcount) "callcount", sum(b.smscount) "smscount", sum(b.durationsum) "durationsum" from calllog_month a, calllog_month b where a.date>=b.date group by date order by a.date;', function(err, rows, fields){ 189 + connection.query('select a.date, sum(b.logcount) "logcount", sum(b.callcount) "callcount", sum(b.smscount) "smscount", sum(b.durationsum) "durationsum" from calllog_month a, calllog_month b where a.date>=b.date group by date order by a.date;', function(err, rows, fields){
191 if(!err){ 190 if(!err){
192 for(var i=0;i<rows.length;i++){ 191 for(var i=0;i<rows.length;i++){
193 logcount_nu.push(rows[i].logcount); 192 logcount_nu.push(rows[i].logcount);
...@@ -198,14 +197,15 @@ connection.query('select a.date, sum(b.logcount) "logcount", sum(b.callcount) "c ...@@ -198,14 +197,15 @@ connection.query('select a.date, sum(b.logcount) "logcount", sum(b.callcount) "c
198 } 197 }
199 else 198 else
200 cc.innerHTML='Error-#5'; 199 cc.innerHTML='Error-#5';
200 + });
201 + }
201 }); 202 });
202 203
203 connection.query('drop table calllog_user; create table calllog_user(name varchar(255), number varchar(20) not null, callcount int, smscount int, durationsum int, primary key(number)); insert into calllog_user(name, number, callcount, durationsum) (select name, number, count(*), sum(duration) from calllog where type in (1,2,3) group by number); update calllog_user cu left join (select number, count(*) "count" from calllog where type not in (1,2,3) group by number) calllog on cu.number=calllog.number set cu.smscount=ifnull(calllog.count,0);', function(err, rows, fields){ 204 connection.query('drop table calllog_user; create table calllog_user(name varchar(255), number varchar(20) not null, callcount int, smscount int, durationsum int, primary key(number)); insert into calllog_user(name, number, callcount, durationsum) (select name, number, count(*), sum(duration) from calllog where type in (1,2,3) group by number); update calllog_user cu left join (select number, count(*) "count" from calllog where type not in (1,2,3) group by number) calllog on cu.number=calllog.number set cu.smscount=ifnull(calllog.count,0);', function(err, rows, fields){
204 if(err) 205 if(err)
205 - cc.innerHTML='Error-#8'; 206 + cc.innerHTML='Error-#6';
206 -}) 207 + else{
207 - 208 + connection.query('select name, number, callcount, smscount from calllog_user order by callcount+smscount desc', function(err, rows, fields){
208 -connection.query('select name, number, callcount, smscount from calllog_user order by callcount+smscount desc', function(err, rows, fields){
209 if(!err){ 209 if(!err){
210 for(var i=0;i<rows.length;i++){ 210 for(var i=0;i<rows.length;i++){
211 var name=rows[i].name; 211 var name=rows[i].name;
...@@ -219,10 +219,10 @@ connection.query('select name, number, callcount, smscount from calllog_user ord ...@@ -219,10 +219,10 @@ connection.query('select name, number, callcount, smscount from calllog_user ord
219 } 219 }
220 } 220 }
221 else 221 else
222 - cc.innerHTML='Error-#8-1'; 222 + cc.innerHTML='Error-#7';
223 -}); 223 + });
224 224
225 -connection.query('select name, number, callcount from calllog_user order by callcount desc', function(err, rows, fields){ 225 + connection.query('select name, number, callcount from calllog_user order by callcount desc', function(err, rows, fields){
226 if(!err){ 226 if(!err){
227 for(var i=0;i<rows.length;i++){ 227 for(var i=0;i<rows.length;i++){
228 var name=rows[i].name; 228 var name=rows[i].name;
...@@ -234,10 +234,10 @@ connection.query('select name, number, callcount from calllog_user order by call ...@@ -234,10 +234,10 @@ connection.query('select name, number, callcount from calllog_user order by call
234 } 234 }
235 } 235 }
236 else 236 else
237 - cc.innerHTML='Error-#8-2'; 237 + cc.innerHTML='Error-#8';
238 -}); 238 + });
239 239
240 -connection.query('select name, number, smscount from calllog_user order by smscount desc', function(err, rows, fields){ 240 + connection.query('select name, number, smscount from calllog_user order by smscount desc', function(err, rows, fields){
241 if(!err){ 241 if(!err){
242 for(var i=0;i<rows.length;i++){ 242 for(var i=0;i<rows.length;i++){
243 var name=rows[i].name; 243 var name=rows[i].name;
...@@ -249,10 +249,10 @@ connection.query('select name, number, smscount from calllog_user order by smsco ...@@ -249,10 +249,10 @@ connection.query('select name, number, smscount from calllog_user order by smsco
249 } 249 }
250 } 250 }
251 else 251 else
252 - cc.innerHTML='Error-#8-3'; 252 + cc.innerHTML='Error-#9';
253 -}); 253 + });
254 254
255 -connection.query('select name, number, durationsum from calllog_user order by durationsum desc', function(err, rows, fields){ 255 + connection.query('select name, number, durationsum from calllog_user order by durationsum desc', function(err, rows, fields){
256 if(!err){ 256 if(!err){
257 for(var i=0;i<rows.length;i++){ 257 for(var i=0;i<rows.length;i++){
258 var name=rows[i].name; 258 var name=rows[i].name;
...@@ -264,15 +264,18 @@ connection.query('select name, number, durationsum from calllog_user order by du ...@@ -264,15 +264,18 @@ connection.query('select name, number, durationsum from calllog_user order by du
264 } 264 }
265 } 265 }
266 else 266 else
267 - cc.innerHTML='Error-#8-4'; 267 + cc.innerHTML='Error-#10';
268 -}); 268 + });
269 + }
270 +})
271 +
272 +
269 273
270 connection.query('drop table calllog_hour; create table calllog_hour(hour int not null, callcount int, smscount int, primary key(hour)); set @hour:=-1; insert into calllog_hour(hour, callcount) (select (@hour:=@hour+1) "hour", (select count(*) from calllog where type in (1,2,3) and hour(date)=@hour) "count" from calllog where @hour<23); update calllog_hour ch left join (select hour(date) "hour", count(*) "count" from calllog where type not in (1,2,3) group by hour(date)) calllog on ch.hour=calllog.hour set ch.smscount=ifnull(calllog.count,0);', function(err, rows, fields){ 274 connection.query('drop table calllog_hour; create table calllog_hour(hour int not null, callcount int, smscount int, primary key(hour)); set @hour:=-1; insert into calllog_hour(hour, callcount) (select (@hour:=@hour+1) "hour", (select count(*) from calllog where type in (1,2,3) and hour(date)=@hour) "count" from calllog where @hour<23); update calllog_hour ch left join (select hour(date) "hour", count(*) "count" from calllog where type not in (1,2,3) group by hour(date)) calllog on ch.hour=calllog.hour set ch.smscount=ifnull(calllog.count,0);', function(err, rows, fields){
271 if(err) 275 if(err)
272 - cc.innerHTML='Error-#8'; 276 + cc.innerHTML='Error-#11';
273 -}) 277 + else{
274 - 278 + connection.query('select * from calllog_hour order by hour;', function(err, rows, fields){
275 -connection.query('select * from calllog_hour order by hour;', function(err, rows, fields){
276 if(!err){ 279 if(!err){
277 for(var i=0;i<rows.length;i++){ 280 for(var i=0;i<rows.length;i++){
278 timeline.push(rows[i].hour); 281 timeline.push(rows[i].hour);
...@@ -282,8 +285,10 @@ connection.query('select * from calllog_hour order by hour;', function(err, rows ...@@ -282,8 +285,10 @@ connection.query('select * from calllog_hour order by hour;', function(err, rows
282 } 285 }
283 } 286 }
284 else 287 else
285 - cc.innerHTML='Error-#10'+err; 288 + cc.innerHTML='Error-#12'+err;
286 -}); 289 + });
290 + }
291 +})
287 292
288 var options = { 293 var options = {
289 title:{ 294 title:{
...@@ -872,7 +877,7 @@ function get_date_analysis(){ ...@@ -872,7 +877,7 @@ function get_date_analysis(){
872 } 877 }
873 } 878 }
874 else 879 else
875 - cc.innerHTML='Error-#6-1'+err; 880 + cc.innerHTML='Error-#14'+err;
876 }); 881 });
877 connection.query('select a.date, sum(b.logcount) "logcount", sum(b.callcount) "callcount", sum(b.smscount) "smscount", sum(b.durationsum) "durationsum" from calllog_between a, calllog_between b where a.date>=b.date group by date order by a.date;', function(err, rows, fields){ 882 connection.query('select a.date, sum(b.logcount) "logcount", sum(b.callcount) "callcount", sum(b.smscount) "smscount", sum(b.durationsum) "durationsum" from calllog_between a, calllog_between b where a.date>=b.date group by date order by a.date;', function(err, rows, fields){
878 if(!err){ 883 if(!err){
...@@ -889,11 +894,11 @@ function get_date_analysis(){ ...@@ -889,11 +894,11 @@ function get_date_analysis(){
889 } 894 }
890 } 895 }
891 else 896 else
892 - cc.innerHTML='Error-#6-2'; 897 + cc.innerHTML='Error-#15';
893 }); 898 });
894 } 899 }
895 else 900 else
896 - cc.innerHTML='Error-#6'+err; 901 + cc.innerHTML='Error-#13'+err;
897 }); 902 });
898 903
899 changeLabelText(month_b, "연락 수", logcount_b, "통화 수", callcount_b, "문자 수", smscount_b, "통화 시간", durationsum_b, "누적 연락 수", logcount_bnu, "누적 통화 수", callcount_bnu, "누적 문자 수",smscount_bnu, "누적 통화 시간", durationsum_bnu,"특정 기간의 통계"); 904 changeLabelText(month_b, "연락 수", logcount_b, "통화 수", callcount_b, "문자 수", smscount_b, "통화 시간", durationsum_b, "누적 연락 수", logcount_bnu, "누적 통화 수", callcount_bnu, "누적 문자 수",smscount_bnu, "누적 통화 시간", durationsum_bnu,"특정 기간의 통계");
...@@ -934,7 +939,7 @@ function get_number_analysis(){ ...@@ -934,7 +939,7 @@ function get_number_analysis(){
934 } 939 }
935 } 940 }
936 else 941 else
937 - cc.innerHTML='Error-#7-1'+err; 942 + cc.innerHTML='Error-#17'+err;
938 }); 943 });
939 connection.query('select a.date, sum(b.logcount) "logcount", sum(b.callcount) "callcount", sum(b.smscount) "smscount", sum(b.durationsum) "durationsum" from calllog_with a, calllog_with b where a.date>=b.date group by date order by a.date;', function(err, rows, fields){ 944 connection.query('select a.date, sum(b.logcount) "logcount", sum(b.callcount) "callcount", sum(b.smscount) "smscount", sum(b.durationsum) "durationsum" from calllog_with a, calllog_with b where a.date>=b.date group by date order by a.date;', function(err, rows, fields){
940 if(!err){ 945 if(!err){
...@@ -951,11 +956,11 @@ function get_number_analysis(){ ...@@ -951,11 +956,11 @@ function get_number_analysis(){
951 } 956 }
952 } 957 }
953 else 958 else
954 - cc.innerHTML='Error-#7-2'; 959 + cc.innerHTML='Error-#18';
955 }); 960 });
956 } 961 }
957 else 962 else
958 - cc.innerHTML='Error-#7'+err; 963 + cc.innerHTML='Error-#16'+err;
959 }); 964 });
960 965
961 changeLabelText(month_w, "연락 수", logcount_w, "통화 수", callcount_w, "문자 수", smscount_w, "통화 시간", durationsum_w, "누적 연락 수", logcount_wnu, "누적 통화 수", callcount_wnu, "누적 문자 수",smscount_wnu, "누적 통화 시간", durationsum_wnu,"특정 연락처와의 통계"); 966 changeLabelText(month_w, "연락 수", logcount_w, "통화 수", callcount_w, "문자 수", smscount_w, "통화 시간", durationsum_w, "누적 연락 수", logcount_wnu, "누적 통화 수", callcount_wnu, "누적 문자 수",smscount_wnu, "누적 통화 시간", durationsum_wnu,"특정 연락처와의 통계");
...@@ -973,9 +978,8 @@ function get_date_rank(){ ...@@ -973,9 +978,8 @@ function get_date_rank(){
973 978
974 connection.query('drop table IF EXISTS calllog_user_between; create table calllog_user_between(name varchar(255), number varchar(20) not null, callcount int, smscount int, durationsum int, primary key(number)); insert into calllog_user_between(name, number, callcount, durationsum) (select name, number, count(*), sum(duration) from calllog where type in (1,2,3) and date between ? and ? group by number); update calllog_user_between cu left join (select number, count(*) "count" from calllog where type not in (1,2,3) and date between ? and ? group by number) calllog on cu.number=calllog.number set cu.smscount=ifnull(calllog.count,0);', [rank_date_start,rank_date_end,rank_date_start,rank_date_end], function(err, rows, fields){ 979 connection.query('drop table IF EXISTS calllog_user_between; create table calllog_user_between(name varchar(255), number varchar(20) not null, callcount int, smscount int, durationsum int, primary key(number)); insert into calllog_user_between(name, number, callcount, durationsum) (select name, number, count(*), sum(duration) from calllog where type in (1,2,3) and date between ? and ? group by number); update calllog_user_between cu left join (select number, count(*) "count" from calllog where type not in (1,2,3) and date between ? and ? group by number) calllog on cu.number=calllog.number set cu.smscount=ifnull(calllog.count,0);', [rank_date_start,rank_date_end,rank_date_start,rank_date_end], function(err, rows, fields){
975 if(err) 980 if(err)
976 - cc.innerHTML='Error-#9'; 981 + cc.innerHTML='Error-#19';
977 - }) 982 + else{
978 -
979 connection.query('select name, number, callcount, smscount from calllog_user_between order by callcount+smscount desc', function(err, rows, fields){ 983 connection.query('select name, number, callcount, smscount from calllog_user_between order by callcount+smscount desc', function(err, rows, fields){
980 if(!err){ 984 if(!err){
981 ranking_brnu.length=0; 985 ranking_brnu.length=0;
...@@ -995,7 +999,7 @@ function get_date_rank(){ ...@@ -995,7 +999,7 @@ function get_date_rank(){
995 } 999 }
996 } 1000 }
997 else 1001 else
998 - cc.innerHTML='Error-#9-1'; 1002 + cc.innerHTML='Error-#20';
999 }); 1003 });
1000 1004
1001 connection.query('select name, number, callcount from calllog_user_between order by callcount desc', function(err, rows, fields){ 1005 connection.query('select name, number, callcount from calllog_user_between order by callcount desc', function(err, rows, fields){
...@@ -1013,7 +1017,7 @@ function get_date_rank(){ ...@@ -1013,7 +1017,7 @@ function get_date_rank(){
1013 } 1017 }
1014 } 1018 }
1015 else 1019 else
1016 - cc.innerHTML='Error-#9-2'; 1020 + cc.innerHTML='Error-#21';
1017 }); 1021 });
1018 1022
1019 connection.query('select name, number, smscount from calllog_user_between order by smscount desc', function(err, rows, fields){ 1023 connection.query('select name, number, smscount from calllog_user_between order by smscount desc', function(err, rows, fields){
...@@ -1031,7 +1035,7 @@ function get_date_rank(){ ...@@ -1031,7 +1035,7 @@ function get_date_rank(){
1031 } 1035 }
1032 } 1036 }
1033 else 1037 else
1034 - cc.innerHTML='Error-#9-3'; 1038 + cc.innerHTML='Error-#22';
1035 }); 1039 });
1036 1040
1037 connection.query('select name, number, durationsum from calllog_user_between order by durationsum desc', function(err, rows, fields){ 1041 connection.query('select name, number, durationsum from calllog_user_between order by durationsum desc', function(err, rows, fields){
...@@ -1049,9 +1053,10 @@ function get_date_rank(){ ...@@ -1049,9 +1053,10 @@ function get_date_rank(){
1049 } 1053 }
1050 } 1054 }
1051 else 1055 else
1052 - cc.innerHTML='Error-#9-4'; 1056 + cc.innerHTML='Error-#23';
1053 }); 1057 });
1054 - 1058 + }
1059 + })
1055 changeLabelText2(ranking_brnu, "누적 연락 수", logcount_brnu, "누적 통화 수", callcount_brnu, "누적 문자 수", smscount_brnu, ranking_brnuc, "누적 통화 수", callcount_brnuc, ranking_brnus, "누적 문자 수", smscount_brnus, ranking_brnud, "누적 통화 시간", durationsum_brnud, [],"특정 기간의 연락 순위"); 1060 changeLabelText2(ranking_brnu, "누적 연락 수", logcount_brnu, "누적 통화 수", callcount_brnu, "누적 문자 수", smscount_brnu, ranking_brnuc, "누적 통화 수", callcount_brnuc, ranking_brnus, "누적 문자 수", smscount_brnus, ranking_brnud, "누적 통화 시간", durationsum_brnud, [],"특정 기간의 연락 순위");
1056 window.myChart.destroy(); 1061 window.myChart.destroy();
1057 //connection.end(); 1062 //connection.end();
...@@ -1080,11 +1085,11 @@ function get_date_timeline(){ ...@@ -1080,11 +1085,11 @@ function get_date_timeline(){
1080 } 1085 }
1081 } 1086 }
1082 else 1087 else
1083 - cc.innerHTML='Error-#11-1'; 1088 + cc.innerHTML='Error-#25';
1084 }); 1089 });
1085 } 1090 }
1086 else 1091 else
1087 - cc.innerHTML='Error-#11'+err; 1092 + cc.innerHTML='Error-#24'+err;
1088 }); 1093 });
1089 1094
1090 changeLabelText(timeline, "누적 연락 수", logcount_tb, "누적 통화 수", callcount_tb, "누적 문자 수", smscount_tb, "수", [], "수", [], "수",[] , "수",[], "수", [],"특정 기간의 선호 연락 시간대"); 1095 changeLabelText(timeline, "누적 연락 수", logcount_tb, "누적 통화 수", callcount_tb, "누적 문자 수", smscount_tb, "수", [], "수", [], "수",[] , "수",[], "수", [],"특정 기간의 선호 연락 시간대");
...@@ -1120,11 +1125,11 @@ function get_number_timeline(){ ...@@ -1120,11 +1125,11 @@ function get_number_timeline(){
1120 } 1125 }
1121 } 1126 }
1122 else 1127 else
1123 - cc.innerHTML='Error-#12-1'; 1128 + cc.innerHTML='Error-#27';
1124 }); 1129 });
1125 } 1130 }
1126 else 1131 else
1127 - cc.innerHTML='Error-#12'+err; 1132 + cc.innerHTML='Error-#26'+err;
1128 }); 1133 });
1129 1134
1130 changeLabelText(timeline, "누적 연락 수", logcount_tw, "누적 통화 수", callcount_tw, "누적 문자 수", smscount_tw, "수", [], "수", [], "수",[] , "수",[], "수", [],"특정 연락처와의 선호 연락 시간대"); 1135 changeLabelText(timeline, "누적 연락 수", logcount_tw, "누적 통화 수", callcount_tw, "누적 문자 수", smscount_tw, "수", [], "수", [], "수",[] , "수",[], "수", [],"특정 연락처와의 선호 연락 시간대");
...@@ -1562,10 +1567,9 @@ more7.addEventListener('click', function(){ ...@@ -1562,10 +1567,9 @@ more7.addEventListener('click', function(){
1562 1567
1563 connection.query('drop table sms_response; create table sms_response (number text, got_date datetime, got_body text, send_date datetime, send_body text, time int); insert into sms_response SELECT sms1.address, sms1.date,sms1.body, sms2.date, sms2.body,timestampdiff(second, sms1.date, sms2.date) FROM sms sms1, sms sms2 where sms1.tid=sms2.tid and sms1.type=1 and sms2.type=2 and timestampdiff(second, sms1.date, sms2.date) >0 and timestampdiff(day,sms2.date, sms1.date)< 2; delete sms1 from sms_response sms1, sms_response sms2 where sms1.send_date=sms2.send_date and timestampdiff(second, sms2.got_date,sms1.got_date)<0; delete sms1 from sms_response sms1, sms_response sms2 where sms1.got_date=sms2.got_date and timestampdiff(second, sms2.send_date,sms1.send_date)>0;', function(err, rows, fields){ 1568 connection.query('drop table sms_response; create table sms_response (number text, got_date datetime, got_body text, send_date datetime, send_body text, time int); insert into sms_response SELECT sms1.address, sms1.date,sms1.body, sms2.date, sms2.body,timestampdiff(second, sms1.date, sms2.date) FROM sms sms1, sms sms2 where sms1.tid=sms2.tid and sms1.type=1 and sms2.type=2 and timestampdiff(second, sms1.date, sms2.date) >0 and timestampdiff(day,sms2.date, sms1.date)< 2; delete sms1 from sms_response sms1, sms_response sms2 where sms1.send_date=sms2.send_date and timestampdiff(second, sms2.got_date,sms1.got_date)<0; delete sms1 from sms_response sms1, sms_response sms2 where sms1.got_date=sms2.got_date and timestampdiff(second, sms2.send_date,sms1.send_date)>0;', function(err, rows, fields){
1564 if(err) 1569 if(err)
1565 - cc.innerHTML='Error-#13'; 1570 + cc.innerHTML='Error-#27';
1566 -}) 1571 + else{
1567 - 1572 + connection.query('select avg(time) "avg" from sms_response;', function(err, rows, fields){
1568 -connection.query('select avg(time) "avg" from sms_response;', function(err, rows, fields){
1569 if(!err){ 1573 if(!err){
1570 var tttt=rows[0].avg; 1574 var tttt=rows[0].avg;
1571 var avg_temp=""; 1575 var avg_temp="";
...@@ -1578,10 +1582,10 @@ connection.query('select avg(time) "avg" from sms_response;', function(err, rows ...@@ -1578,10 +1582,10 @@ connection.query('select avg(time) "avg" from sms_response;', function(err, rows
1578 values_list_res.push({get_body:"해당 기간의 평균 답장 시간", send_body:avg_temp}); 1582 values_list_res.push({get_body:"해당 기간의 평균 답장 시간", send_body:avg_temp});
1579 } 1583 }
1580 else 1584 else
1581 - cc.innerHTML='Error-#13-11'+err; 1585 + cc.innerHTML='Error-#28'+err;
1582 -}); 1586 + });
1583 1587
1584 -connection.query('select * from sms_response;', function(err, rows, fields){ 1588 + connection.query('select * from sms_response;', function(err, rows, fields){
1585 if(!err){ 1589 if(!err){
1586 for(var i=0;i<rows.length;i++){ 1590 for(var i=0;i<rows.length;i++){
1587 var number_temp=rows[i].number; 1591 var number_temp=rows[i].number;
...@@ -1603,8 +1607,12 @@ connection.query('select * from sms_response;', function(err, rows, fields){ ...@@ -1603,8 +1607,12 @@ connection.query('select * from sms_response;', function(err, rows, fields){
1603 myList4 = new List('listspace4', options_list_res, values_list_res); 1607 myList4 = new List('listspace4', options_list_res, values_list_res);
1604 } 1608 }
1605 else 1609 else
1606 - cc.innerHTML='Error-#13-1'+err; 1610 + cc.innerHTML='Error-#29'+err;
1607 -}); 1611 + });
1612 + }
1613 +})
1614 +
1615 +
1608 1616
1609 1617
1610 function get_number_restime_push(){ 1618 function get_number_restime_push(){
...@@ -1640,7 +1648,7 @@ function get_number_restime(){ ...@@ -1640,7 +1648,7 @@ function get_number_restime(){
1640 values_list_res_with.push({get_body:"해당 기간의 평균 답장 시간", send_body:avg_temp}); 1648 values_list_res_with.push({get_body:"해당 기간의 평균 답장 시간", send_body:avg_temp});
1641 } 1649 }
1642 else 1650 else
1643 - cc.innerHTML='Error-#13-21'+err; 1651 + cc.innerHTML='Error-#30'+err;
1644 }); 1652 });
1645 1653
1646 connection.query('select * from sms_response where number in (?);',[restime_number], function(err, rows, fields){ 1654 connection.query('select * from sms_response where number in (?);',[restime_number], function(err, rows, fields){
...@@ -1665,7 +1673,7 @@ function get_number_restime(){ ...@@ -1665,7 +1673,7 @@ function get_number_restime(){
1665 myList5 = new List('listspace5', options_list_res, values_list_res_with); 1673 myList5 = new List('listspace5', options_list_res, values_list_res_with);
1666 } 1674 }
1667 else 1675 else
1668 - cc.innerHTML='Error-#13-2'+err; 1676 + cc.innerHTML='Error-#31'+err;
1669 }); 1677 });
1670 //connection.end(); 1678 //connection.end();
1671 } 1679 }
......