a

JoongunPark · Mar 26, 2015 · 6d0c287 · 6d0c287
1 parent 2fb818c
commit 6d0c287
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/static/strawberry.csv b/static/strawberry.csv
@@ -0,0 +1,4 @@
+reservationID,name,studentID,club,strawBerry,GimBob,phone,date
+1,������,11111111,����,1,1,010-1231-1231,04/01/2015
+3,�ƹ���,10203401,�ƹ���ü,1,124,010-2223-1111,04/01/2015
+4,�ƹ���,10203401,�ƹ���ü,1,124,010-2223-1111,04/01/2015
diff --git a/static/yum.csv b/static/yum.csv
@@ -1,2 +1,3 @@
 reservationID,name,studentID,club,strawBerry,GimBob,phone,date
-1,������,20120600,���Ž�,1,1,010-9072-0292,April 1st
+6,�ƹ���,10203401,�ƹ���ü,1,124,010-2223-1111,04/10/2015
+10,�ƹ���,10203401,�ƹ���ü,1,124,010-2223-1111,04/10/2015
diff --git a/strawberry/views.py b/strawberry/views.py
@@ -59,7 +59,7 @@ def printEx(num):
 
     l.sort(compare)
 
-    with io.open("static/yum.csv", 'w', encoding='cp949') as outfile:
+    with io.open("static/strawberry.csv", 'w', encoding='cp949') as outfile:
         outfile.write(("reservationID,name,studentID,club,strawBerry,GimBob,phone,date\n").decode('cp949'))
         for t in l:
             if num==t[0]:

diff --git a/templates/master.html b/templates/master.html
@@ -44,7 +44,7 @@
             })
         });
 </script>
-    <a href="../../static/yum.csv">
+    <a href="../../static/strawberry.csv">
             <button> 출력하기 </button>
     </a>
     </body>

diff --git a/templates/reserve.html b/templates/reserve.html
@@ -58,11 +58,18 @@
           <h1>2015 딸기파티 신청하기</h1>
           <h2>지금 신청하세요!</h2>
           <h3>신청 하게.</h3>
-          <p class="lead"> 경고 : 당신은 죽을 수도 있습니다.</p>
+          <p class="lead"> zzz</p>
     </div>
       {% if status != 'success' %}
     <form class="form-horizontal" action="#" method="post" style="">
         {% csrf_token %}
+         <div class="form-group">
+            <label for="date" class="col-sm-2 control-label">날짜</label>
+            <div class="col-sm-10">
+                <input type="text" id="dpd3" value="04/01/2015" name="date" class="form-control" readonly placeholder="4월 1일~4월 11일(일요일 제외)입니다">
+            </div>
+        </div>
+
         <div class="form-group">
             <label for="inputID" class="col-sm-2 control-label">학번</label>
             <div class="col-sm-10">
@@ -106,12 +113,7 @@ <h3>신청 하게.</h3>
                 <input type="text" name="numRolls" class="form-control" placeholder="숫자만 입력하세요">
             </div>
         </div>
-        <div class="form-group">
-            <label for="date" class="col-sm-2 control-label">날짜</label>
-            <div class="col-sm-10">
-                <input type="text" id="dpd3" name="date" class="form-control" readonly placeholder="4월 1일~4월 11일(일요일 제외)입니다">
-            </div>
-        </div>
+
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
                 <button type="submit" class="btn btn-primary">예약하기</button>