Vacity 7 years ago
parent
commit
6f184f4fc5

+ 144 - 73
.idea/workspace.xml

@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6ab6cf33-62bd-48c1-935e-834777603958" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
@@ -32,62 +33,71 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="200">
-              <caret line="39" column="31" selection-start-line="39" selection-start-column="31" selection-end-line="39" selection-end-column="31" />
-              <folding>
-                <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#select#0;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#input#0;n#div#1;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-              </folding>
+            <state relative-caret-position="402">
+              <caret line="37" column="19" lean-forward="true" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="19" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminMovieManage.html">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/MovieForm.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="238">
-              <caret line="47" selection-start-line="47" selection-end-line="131" selection-end-column="6" />
+            <state relative-caret-position="136">
+              <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="153">
-              <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+            <state relative-caret-position="257">
+              <caret line="19" column="7" lean-forward="true" selection-start-line="19" selection-start-column="7" selection-end-line="19" selection-end-column="7" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/HallVO.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="136">
-              <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+            <state relative-caret-position="102">
+              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/UserForm.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="294">
-              <caret line="21" column="24" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
+            <state relative-caret-position="102">
+              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/UserVO.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="136">
-              <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
+            <state relative-caret-position="102">
+              <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="377">
+              <caret line="93" column="59" lean-forward="true" selection-start-line="93" selection-start-column="40" selection-end-line="93" selection-end-column="59" />
+              <folding>
+                <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#select#0;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#input#0;n#div#1;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -117,13 +127,13 @@
         <option value="$PROJECT_DIR$/src/main/resources/templates/adminMovieDetail.html" />
         <option value="$PROJECT_DIR$/src/main/resources/templates/adminMovieManage.html" />
         <option value="$PROJECT_DIR$/src/main/resources/templates/adminSessionManage.html" />
-        <option value="$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js" />
         <option value="$PROJECT_DIR$/src/main/resources/static/css/cinemaHall.css" />
         <option value="$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html" />
         <option value="$PROJECT_DIR$/src/main/resources/templates/adminPromotionManage.html" />
         <option value="$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css" />
-        <option value="$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js" />
+        <option value="$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js" />
         <option value="$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html" />
+        <option value="$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js" />
       </list>
     </option>
   </component>
@@ -207,12 +217,38 @@
               <item name="cinema" type="462c0819:PsiDirectoryNode" />
               <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="cinema" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="cinema" type="462c0819:PsiDirectoryNode" />
+              <item name="vo" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="cinema" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="cinema" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="cinema" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="js" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="cinema" type="b2602c69:ProjectViewProjectNode" />
@@ -239,20 +275,20 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555049136894" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555055051655" />
     <property name="list.type.of.created.stylesheet" value="CSS" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="/usr/local/bin/node" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="project.propCompiler" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/src/main/resources/static/images" />
-    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/src/main/resources/static/images" />
       <recent name="$PROJECT_DIR$/src/main/resources/static/css" />
     </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src/main/resources/static/images" />
+    </key>
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -291,7 +327,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="9675000" />
+    <option name="totallyTimeSpent" value="13141000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1680" height="1050" extended-state="0" />
@@ -358,13 +394,6 @@
     <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/8eb638ea-600e-4517-a65e-b84945e9bbd6/console.sql">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" lean-forward="true" selection-start-line="12" selection-end-line="12" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/templates/userHome.html">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -466,20 +495,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminMovieManage.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-4">
-          <caret selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminMovieDetail.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="340">
@@ -494,13 +509,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" column="14" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="294">
@@ -510,8 +518,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1479">
-          <caret line="87" column="22" selection-start-line="87" selection-start-column="22" selection-end-line="87" selection-end-column="22" />
+        <state relative-caret-position="-302">
+          <caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
         </state>
       </provider>
     </entry>
@@ -522,16 +530,30 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminMovieManage.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        <state relative-caret-position="238">
+          <caret line="47" selection-start-line="47" selection-end-line="131" selection-end-column="6" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/HallController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="153">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="170">
+          <caret line="10" column="17" lean-forward="true" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-181">
+        <state relative-caret-position="17">
           <caret line="4" column="15" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
           <folding>
             <element signature="n#style#0;n#input#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
@@ -539,27 +561,76 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminMovieManage.html">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="47" selection-start-line="47" selection-end-line="131" selection-end-column="6" />
+        <state>
+          <caret selection-end-column="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminMovieManage.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="854">
+          <caret line="65" lean-forward="true" selection-start-line="65" selection-end-line="65" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/UserVO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/HallVO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/MovieForm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="136">
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/UserForm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="102">
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="257">
+          <caret line="19" column="7" lean-forward="true" selection-start-line="19" selection-start-column="7" selection-end-line="19" selection-end-column="7" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="200">
-          <caret line="39" column="31" selection-start-line="39" selection-start-column="31" selection-end-line="39" selection-end-column="31" />
+        <state relative-caret-position="377">
+          <caret line="93" column="59" lean-forward="true" selection-start-line="93" selection-start-column="40" selection-end-line="93" selection-end-column="59" />
           <folding>
             <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#select#0;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#select#0;n#div#0;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#input#0;n#div#1;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="402">
+          <caret line="37" column="19" lean-forward="true" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

+ 13 - 12
src/main/resources/static/js/adminCinemaManage.js

@@ -3,18 +3,20 @@ $(document).ready(function() {
     getCinemaHalls();
 
     function getCinemaHalls() {
-        var halls = [
-            {
-                name: '1号厅',
-                column: 10,
-                row: 5
+        var halls = [];
+        getRequest(
+            '/hall/all',
+            function (res) {
+                halls = res.content;
+                renderHall(halls);
             },
-            {
-                name: '2号厅',
-                column: 12,
-                row: 8
-            },
-        ];
+            function (error) {
+                alert(JSON.stringify(error));
+            }
+        );
+    }
+
+    function renderHall(halls){
         $('#hall-card').empty();
         var hallDomStr = "";
         halls.forEach(function (hall) {
@@ -39,5 +41,4 @@ $(document).ready(function() {
         })
         $('#hall-card').append(hallDomStr);
     }
-
 });

+ 45 - 1
src/main/resources/static/js/adminScheduleManage.js

@@ -7,4 +7,48 @@ var colors = [
     '#FFFF33',
     '#9966FF',
     '#FF6666',
-]
+];
+
+function formatDate(date){
+    var year = date.getFullYear();
+    var month = date.getMonth()+1+'';
+    var day = date.getDate()+'';
+    month.length===1 && (month = '0'+month)
+    day.length===1 && (day = '0'+day)
+    return year+'-'+month+'-'+day;
+}
+
+$(document).ready(function() {
+    var hallId,
+        scheduleDate = formatDate(new Date());
+
+    initSelectAndDate();
+
+    function initSelectAndDate() {
+        $('#schedule-date-input').val(scheduleDate);
+        getCinemaHalls();
+        $('#hall-select').change (function () {
+            hallId=$(this).children('option:selected').val();
+        });
+
+    }
+
+    function getCinemaHalls() {
+        var halls = [];
+        getRequest(
+            '/hall/all',
+            function (res) {
+                halls = res.content;
+                halls.forEach(function (hall) {
+                    $('#hall-select').append("<option value="+ hall.id +">"+hall.name+"</option>");
+                    $('#schedule-hall-input').append("<option value="+ hall.id +">"+hall.name+"</option>");
+                })
+            },
+            function (error) {
+                alert(JSON.stringify(error));
+            }
+        );
+    }
+
+});
+

+ 26 - 6
src/main/resources/templates/adminScheduleManage.html

@@ -13,6 +13,8 @@
     <script src="/js/jquery.js"></script>
     <script src="/js/bootstrap.js"></script>
     <script src="/js/request.js"></script>
+    <script src="/js/adminScheduleManage.js"></script>
+
 </head>
 <body>
 <div class="main-container">
@@ -38,8 +40,6 @@
                 <div>
                 <span>选择影厅  </span>
                 <select id="hall-select" class="form-control" style="display: inline-block;width: 180px;">
-                    <option>1</option>
-                    <option>2</option>
                 </select>
                 </div>
                 <div>
@@ -82,15 +82,35 @@
             <div class="modal-body">
                 <form class="form-horizontal" role="form">
                     <div class="form-group">
-                        <label class="col-sm-2 control-label" for="movie-name-input"><span class="error-text">*</span>电影名称</label>
+                        <label class="col-sm-2 control-label" for="schedule-movie-input"><span class="error-text">*</span>电影名称</label>
+                        <div class="col-sm-10">
+                            <select id="schedule-movie-input" class="form-control">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label" for="schedule-hall-input"><span class="error-text">*</span>放映影厅</label>
+                        <div class="col-sm-10">
+                            <select id="schedule-hall-input" class="form-control">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label" for="schedule-start-date-input"><span class="error-text">*</span>开始时间</label>
+                        <div class="col-sm-10">
+                            <input type="datetime-local" class="form-control" id="schedule-start-date-input" placeholder="请选择开始时间">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label" for="schedule-end-date-input"><span class="error-text">*</span>结束时间</label>
                         <div class="col-sm-10">
-                            <input type="text" class="form-control" id="movie-name-input" placeholder="请输入电影名称">
+                            <input type="datetime-local" class="form-control" id="schedule-end-date-input" placeholder="请选择结束时间">
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-sm-2 control-label" for="movie-date-input"><span class="error-text">*</span>上映时间</label>
+                        <label class="col-sm-2 control-label" for="schedule-price-input"><span class="error-text">*</span>场次票价</label>
                         <div class="col-sm-10">
-                            <input type="date" class="form-control" id="movie-date-input" placeholder="请输入电影上映时间">
+                            <input type="text" class="form-control" id="schedule-price-input" placeholder="请输入票价">
                         </div>
                     </div>
                 </form>

+ 13 - 12
target/classes/static/js/adminCinemaManage.js

@@ -3,18 +3,20 @@ $(document).ready(function() {
     getCinemaHalls();
 
     function getCinemaHalls() {
-        var halls = [
-            {
-                name: '1号厅',
-                column: 10,
-                row: 5
+        var halls = [];
+        getRequest(
+            '/hall/all',
+            function (res) {
+                halls = res.content;
+                renderHall(halls);
             },
-            {
-                name: '2号厅',
-                column: 12,
-                row: 8
-            },
-        ];
+            function (error) {
+                alert(JSON.stringify(error));
+            }
+        );
+    }
+
+    function renderHall(halls){
         $('#hall-card').empty();
         var hallDomStr = "";
         halls.forEach(function (hall) {
@@ -39,5 +41,4 @@ $(document).ready(function() {
         })
         $('#hall-card').append(hallDomStr);
     }
-
 });

+ 45 - 1
target/classes/static/js/adminScheduleManage.js

@@ -7,4 +7,48 @@ var colors = [
     '#FFFF33',
     '#9966FF',
     '#FF6666',
-]
+];
+
+function formatDate(date){
+    var year = date.getFullYear();
+    var month = date.getMonth()+1+'';
+    var day = date.getDate()+'';
+    month.length===1 && (month = '0'+month)
+    day.length===1 && (day = '0'+day)
+    return year+'-'+month+'-'+day;
+}
+
+$(document).ready(function() {
+    var hallId,
+        scheduleDate = formatDate(new Date());
+
+    initSelectAndDate();
+
+    function initSelectAndDate() {
+        $('#schedule-date-input').val(scheduleDate);
+        getCinemaHalls();
+        $('#hall-select').change (function () {
+            hallId=$(this).children('option:selected').val();
+        });
+
+    }
+
+    function getCinemaHalls() {
+        var halls = [];
+        getRequest(
+            '/hall/all',
+            function (res) {
+                halls = res.content;
+                halls.forEach(function (hall) {
+                    $('#hall-select').append("<option value="+ hall.id +">"+hall.name+"</option>");
+                    $('#schedule-hall-input').append("<option value="+ hall.id +">"+hall.name+"</option>");
+                })
+            },
+            function (error) {
+                alert(JSON.stringify(error));
+            }
+        );
+    }
+
+});
+

+ 26 - 6
target/classes/templates/adminScheduleManage.html

@@ -13,6 +13,8 @@
     <script src="/js/jquery.js"></script>
     <script src="/js/bootstrap.js"></script>
     <script src="/js/request.js"></script>
+    <script src="/js/adminScheduleManage.js"></script>
+
 </head>
 <body>
 <div class="main-container">
@@ -38,8 +40,6 @@
                 <div>
                 <span>选择影厅  </span>
                 <select id="hall-select" class="form-control" style="display: inline-block;width: 180px;">
-                    <option>1</option>
-                    <option>2</option>
                 </select>
                 </div>
                 <div>
@@ -82,15 +82,35 @@
             <div class="modal-body">
                 <form class="form-horizontal" role="form">
                     <div class="form-group">
-                        <label class="col-sm-2 control-label" for="movie-name-input"><span class="error-text">*</span>电影名称</label>
+                        <label class="col-sm-2 control-label" for="schedule-movie-input"><span class="error-text">*</span>电影名称</label>
+                        <div class="col-sm-10">
+                            <select id="schedule-movie-input" class="form-control">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label" for="schedule-hall-input"><span class="error-text">*</span>放映影厅</label>
+                        <div class="col-sm-10">
+                            <select id="schedule-hall-input" class="form-control">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label" for="schedule-start-date-input"><span class="error-text">*</span>开始时间</label>
+                        <div class="col-sm-10">
+                            <input type="datetime-local" class="form-control" id="schedule-start-date-input" placeholder="请选择开始时间">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label" for="schedule-end-date-input"><span class="error-text">*</span>结束时间</label>
                         <div class="col-sm-10">
-                            <input type="text" class="form-control" id="movie-name-input" placeholder="请输入电影名称">
+                            <input type="datetime-local" class="form-control" id="schedule-end-date-input" placeholder="请选择结束时间">
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-sm-2 control-label" for="movie-date-input"><span class="error-text">*</span>上映时间</label>
+                        <label class="col-sm-2 control-label" for="schedule-price-input"><span class="error-text">*</span>场次票价</label>
                         <div class="col-sm-10">
-                            <input type="date" class="form-control" id="movie-date-input" placeholder="请输入电影上映时间">
+                            <input type="text" class="form-control" id="schedule-price-input" placeholder="请输入票价">
                         </div>
                     </div>
                 </form>