2020-1-capstone-design2 / 2016104137

Go to a project
Toggle navigation Toggle navigation pinning
유희정
a9d4de80 1 parent 70d7ad5c

modify some functions

Inline Side-by-side
Showing 4 changed files with 14 additions and 4 deletions
...@@ -85,6 +85,14 @@ p.float_left{ ...@@ -85,6 +85,14 @@ p.float_left{
85 height:60px; 85 height:60px;
86 float : left; 86 float : left;
87 } 87 }
88 +#d{
89 + float:top;
90 + margin-top: -3px;
91 +}
92 +#n{
93 + float:top;
94 + margin-top: -16px;
95 +}
88 .check{ 96 .check{
89 width : 40px; 97 width : 40px;
90 height:60px; 98 height:60px;
......
...@@ -100,9 +100,11 @@ ...@@ -100,9 +100,11 @@
100 path = result[i].path; 100 path = result[i].path;
101 var num = path.indexOf("DCIM"); 101 var num = path.indexOf("DCIM");
102 var folder_path = new String(); 102 var folder_path = new String();
103 + var time = new Date(Number(result[i].date_added)*1000);
104 + var month = time.getMonth()+1;
103 folder_path = "../../photos/"+ path.substring(num); 105 folder_path = "../../photos/"+ path.substring(num);
104 myHTML += '<div class="photo"><div class="top"><img id="p" src="'+folder_path 106 myHTML += '<div class="photo"><div class="top"><img id="p" src="'+folder_path
105 - +'"></div><div class="bottom"><div class="name"><p id="title">'+result[i].display_name+'</p></div>'; 107 + +'"></div><div class="bottom"><div class="name"><p id="d">['+month+'/'+time.getDate()+']</p><p id="n">'+result[i].display_name+'</p></div>';
106 var replacement = folder_path.replace(/ /g, "#%&!"); 108 var replacement = folder_path.replace(/ /g, "#%&!");
107 myHTML +="<div class='check'><input type='checkbox' name='save' value="+replacement+"></div></div></div>" 109 myHTML +="<div class='check'><input type='checkbox' name='save' value="+replacement+"></div></div></div>"
108 } 110 }
......
...@@ -34,8 +34,8 @@ closeBtn.addEventListener("click", () => { ...@@ -34,8 +34,8 @@ closeBtn.addEventListener("click", () => {
34 var st = new Date(start_date); 34 var st = new Date(start_date);
35 var et = new Date(end_date); 35 var et = new Date(end_date);
36 36
37 - st.setHours(st.getHours() - 9); 37 + st.setHours(st.getHours());
38 - et.setHours(et.getHours() + 15); 38 + et.setHours(et.getHours() + 24);
39 et.setMilliseconds(et.getMilliseconds() -1); 39 et.setMilliseconds(et.getMilliseconds() -1);
40 40
41 var sTimestamp =st.getTime(); 41 var sTimestamp =st.getTime();
......
...@@ -193,7 +193,7 @@ function makeTimeline(){ ...@@ -193,7 +193,7 @@ function makeTimeline(){
193 type = "부재 중" 193 type = "부재 중"
194 } 194 }
195 else{ 195 else{
196 - type = "스팸" 196 + return;
197 } 197 }
198 myHTML += '<div class="timeline">' 198 myHTML += '<div class="timeline">'
199 +'<a href="#" class="timeline-content">' 199 +'<a href="#" class="timeline-content">'
......