buttons style changed

c8dff581 · Arturo Montejo Ráez · a3974107 · c8dff581 · c8dff581 · c8dff581
Commit c8dff581 authored Feb 15, 2017 by Arturo Montejo Ráez
Showing with 80 additions and 40 deletions
android/Pictogram/supervisor_tablet/supervisor_tablet.iml
android/Pictogram/tabletlibrary/tabletlibrary.iml
android/Pictogram/yotta_tablet/yotta_tablet.iml
sails/src/assets/scripts/modules/student/controllers/session.js
sails/src/assets/scripts/modules/student/views/session.html
--- a/android/Pictogram/supervisor_tablet/supervisor_tablet.iml
+++ b/android/Pictogram/supervisor_tablet/supervisor_tablet.iml
--- a/android/Pictogram/tabletlibrary/tabletlibrary.iml
+++ b/android/Pictogram/tabletlibrary/tabletlibrary.iml
@@ -9,7 +9,6 @@
    <facet type="android" name="Android">
      <configuration>
        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
        <afterSyncTasks>
@@ -20,7 +19,7 @@
        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-        <option name="LIBRARY_PROJECT" value="true" />
+        <option name="PROJECT_TYPE" value="1" />
      </configuration>
    </facet>
  </component>
@@ -47,7 +46,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
@@ -55,7 +53,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
@@ -63,7 +60,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
@@ -71,7 +67,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
@@ -79,7 +74,6 @@
      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
@@ -123,7 +117,6 @@
    <orderEntry type="library" exported="" name="support-vector-drawable-24.2.1" level="project" />
    <orderEntry type="library" exported="" name="support-core-utils-24.2.1" level="project" />
    <orderEntry type="module" module-name="commonlibrary" exported="" />
-    <orderEntry type="library" exported="" name="android-android-24" level="project" />
    <orderEntry type="library" exported="" name="okhttp-ws-2.3.0" level="project" />
    <orderEntry type="library" exported="" name="play-services-base-9.2.1" level="project" />
    <orderEntry type="library" exported="" name="socket.io-client-0.5.0" level="project" />

--- a/android/Pictogram/yotta_tablet/yotta_tablet.iml
+++ b/android/Pictogram/yotta_tablet/yotta_tablet.iml
--- a/sails/src/assets/scripts/modules/student/controllers/session.js
+++ b/sails/src/assets/scripts/modules/student/controllers/session.js
@@ -41,6 +41,8 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
  $scope.selected = { item:  -1 };
+  $scope.section = 'new';
  // Query to obtain an array of student methods
  $http
   .get(config.backend+'/stu/'+ $scope.studentData.id +'/methods')
@@ -192,7 +194,7 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
       .post(config.backend+'/ws', {
          "id_sup": $scope.user.id,
          "id_stu": $scope.studentData.id,
-          "id_ins": scope.selected.instruction.id,
+          "id_ins": $scope.selected.instruction.id,
          "begin": new Date().toISOString()
       })
       .success(function(data, status, headers, config) {
@@ -212,8 +214,8 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
          // Adding initial action to the list of actions
          $scope.actual_try.actions.push({ action: 'tryinit' });
-          $scope.studentData.current_method = scope.selected.method.name;
+          $scope.studentData.current_method = $scope.selected.method.name;
-          $scope.studentData.current_instruction = scope.selected.instruction.name;
+          $scope.studentData.current_instruction = $scope.selected.instruction.name;
       })
       .error(function(data, status, headers, config) {
         ngToast.danger({ content: $translate.instant('error_creating_session') });

--- a/sails/src/assets/scripts/modules/student/views/session.html
+++ b/sails/src/assets/scripts/modules/student/views/session.html
 <div class="panel panel-default student_tab_panel">
  <div class="panel-body">
-    <div class="alert alert-danger" role="alert" ng-show="studentData.num_peers<2">
-      <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+    <div class="form-group">
-      <span class="sr-only">Error:</span>
+      <div class="btn-group">
-      {{ 'warning_no_tablet_online' | translate }}
+        <button class="btn btn-default" btn-radio="'new'" ng-model="section">
+          <span class="glyphicon glyphicon-record"></span> {{ 'new_session' | translate }}
+        </button>
+        <button class="btn btn-default" btn-radio="'previous'" ng-model="section">
+          <span class="glyphicon glyphicon-transfer"></span> {{ 'previous_sessions' | translate }}
+        </button>
+      </div>
+      <div class="alert alert-danger" role="alert" ng-show="studentData.num_peers<2">
+        <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+        <span class="sr-only">Error:</span>
+        {{ 'warning_no_tablet_online' | translate }}
+      </div>
    </div>
    <div class="row">
+      <!-- select instruction -->
      <div class="col-md-6">
        <form role="form" action="#" ng-hide="ws_recover ">
          <select class="form-control" name="met_select" id="met_select" ng-model="selected.item" ng-change="load_tries()">
@@ -16,9 +30,13 @@
          </select>
        </form>
      </div>
+      <!-- / select instruction -->
      <div class="col-md-6">
-        <div class="row session-controls form-horizontal" ng-show="selected.item != -1">
-          <div class="col-md-4 form-group">
+        <div class="session-controls form-horizontal" ng-show="selected.item != -1">
+          <!-- show number of sessions and dropdown button -->
+          <div class="form-group" ng-show="section == 'previous'">
            <span class="control-label"> {{ wsessions.length }} {{ 'sessions' | translate }}</span>
            <button ng-click="showSessions = !showSessions" class="btn btn-default btn-sm" ng-disabled="wsessions.length == 0">
                <div ng-show="!showSessions">
@@ -29,8 +47,11 @@
                </div>
            </button>
          </div>
-          <div class="col-md-8 form-group" ng-disabled="selected.item == -1 || studentData.num_peers<2">
+          <!-- / number of sessions and dropdown button -->
-            <div class="btn-group pull-right"> <!-- controls for session recording-->
+          <!-- controls for session recording-->
+          <div class="form-group" ng-show="selected.item != -1 && studentData.num_peers>1 && section == 'new'">
+            <div class="btn-group pull-right">
              <button type="button"
                      class="btn btn-default btn-sm"
                      ng-class="{ disabled: sessionRunning }"
@@ -65,13 +86,27 @@
                      ng-click="stop_ws();">
                <span class="glyphicon glyphicon-stop"></span> {{ 'stop' | translate }}
              </button>
-            </div> <!-- / controls for session recording-->
+            </div>
          </div>
+          <!-- / controls for session recording-->
        </div>
      </div>
    </div>
+    <!-- first row with instruction select and controls -->
    <div id="tries">
-      <div id="actual_try" ng-model="actual_try" ng-show="tryRunning">
+      <!-- alert on non closed session -->
+      <div class="alert alert-danger" role="alert" ng-show="ws_recover">
+        <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
+        <span class="sr-only">Error:</span>
+        {{ 'warning_last_session_bad' | translate }}
+        <button class="btn btn-warning btn-sm" type="button" ng-click="close_ws()" translate>close_session</button>
+      </div>
+      <!-- running try -->
+      <div id="actual_try" ng-model="actual_try" ng-show="tryRunning && section == 'new'">
        <div class="try_time">
          <timer id="time_try" class="color_blue" interval="1000" auto-start="false">
            {{mminutes}}:{{sseconds}}
@@ -148,41 +183,49 @@
          <div class="clean"></div>
        </div>
      </div>
-      <div class="tries_nav" ng-show="!showLastTry && wsessions.length > 0">
+      <!-- / running try -->
+      <div class="tries_nav" ng-show="!showLastTry && wsessions.length > 0"> POR AQUI VOY
        <a ng-click="before()" class="btn btn-sm" role="button" id="" ng-disabled="currentPage == 1" ng-hide="wsessions.length == 0">
          <span class="glyphicon glyphicon-chevron-up" aria-hidden="true" popover="{{ 'next_sessions' | translate}}" popover-trigger="mouseenter"></span>
        </a>
      </div>
-      <div class="alert alert-danger" role="alert" ng-show="ws_recover">
+      <!-- sessions list -->
-        <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span>
-        <span class="sr-only">Error:</span>
-        {{ 'warning_last_session_bad' | translate }}
-        <button class="btn btn-warning btn-sm" type="button" ng-click="close_ws()" translate>close_session</button>
-      </div>
      <div class="list-group" ng-show="showSessions || showLastTry && wsessions.length > 0">
        <div class="list-group-item" ng-repeat="s in wsessions | orderBy: '-begin' | limitTo: numPerPage:(currentPage-1)*numPerPage">
          <div ng-show="showLastTry && wsessions.length > 0">
-            <h4><strong>{{ 'last_session' | translate}}</strong>: {{ studentData.current_method }}, {{ studentData.current_instruction }}</h4>
+            <h4><strong>{{ 'last_session' | translate }}</strong>: {{ studentData.current_method }}, {{ studentData.current_instruction }}</h4>
+          </div>
+          <div class="form-group pull-right">
+            <span class="control-label"> {{ s.tries.length }} {{ 'tries' | translate }}</span>
+            <button ng-click="showTries = !showTries" class="btn btn-default btn-sm">
+                <div ng-show="!showTries">
+                  {{ 'show' | translate }} <span class="glyphicon glyphicon-collapse-down" aria-hidden="true"></span>
+                </div>
+                <div ng-show="showTries">
+                  {{ 'hide' | translate }} <span class="glyphicon glyphicon-collapse-up" aria-hidden="true"></span>
+                </div>
+            </button>
          </div>
-          <button class="btn btn-primary pull-right" type="button" ng-click="showTries = !showTries">
-            {{ 'tries' | translate }}
-            <span class="badge">{{ s.tries.length }}</span>
-          </button>
          <!-- span ng-show="!showLastTry" class="list-group-item-heading color_green">{{$index+1}}&nbsp;&nbsp;&nbsp;</span -->
          <p style="text-align: left ; margin-bottom: 5px" class="list-group-item-text color_green">
            <span translate>session</span> <b>{{ 'tpl_day' | translate:{'day':s.begin} }}</b>
            {{ 'tpl_hours_frame' | translate:{'begin':s.begin, 'end':s.end} }}
          </p>
          <textarea type="editable title"  rows="2"  id="ins_desc_ws" placeholder=" {{ 'session_notes' | translate }}" ng-model="s.description"
-        ng-model-options="{ updateOn: 'blur' }"  ng-change="update_ws(s)" cols="80"></textarea>
+                    ng-model-options="{ updateOn: 'blur' }"  ng-change="update_ws(s)" cols="80"></textarea>
          <a class="session_details" ng-click="showTries = !showTries">
            <span ng-if="!showTries" class="glyphicon glyphicon-collapse-down color_green" aria-hidden="true"></span>
            <span ng-if="showTries" class="glyphicon glyphicon-collapse-up color_green" aria-hidden="true"></span>
          </a>
-          <div class="sessionTries" ng-class="{ 'hidden': !showTries && ws.id!=s.id }">
+          <!-- tries list -->
+          <div class="sessionTries" ng-show="showTries || ws.id == s.id">
            <div class="try" ng-repeat="t in s.tries">
              <div ng-show="!is_currentOpenTry(t)">
                <table width="100%">
@@ -286,7 +329,7 @@
                        <span ng-if="!showActions" class="glyphicon glyphicon-collapse-down" aria-hidden="true"></span>
                        <span ng-if="showActions" class="glyphicon glyphicon-collapse-up" aria-hidden="true"></span>
                      </a>
-                      <div class="tryNotes pull-left" ng-class="{ 'hidden': !showTryNotes }">
+                      <div class="tryNotes pull-left" ng-show="showTryNotes">
                        <textarea type="editable title"  rows="2"  id="ins_desc_try" placeholder=" {{ 'notes' | translate }}" ng-model="t.description" ng-model-options="{ updateOn: 'blur' }"  ng-change="update_try(t)" cols="80"></textarea>
                      </div>
                    </td>
@@ -295,6 +338,7 @@
              </div>
            </div>
          </div>
+          <!-- / tries list -->
        </div>
        <div class="tries_nav" ng-show="!showLastTry ">
          <a ng-click="after()" class="btn btn-sm" role="button" id="" ng-disabled="currentPage == totalPages || totalPages == 0" ng-hide="wsessions.length == 0">
@@ -302,6 +346,7 @@
          </a>
        </div>
      </div>
-    </div>
+      <!-- / sessions list -->
-  </div>
+    </div>  <!-- / tries -->
-</div>
+  </div> <!-- / panel-body -->
+</div> <!-- /panel -->