Fixed issues: hacklabcbba#182, hacklabcbba#211 and hacklabcbba#139

hdwilber · Oct 27, 2016 · bfc8f2c · bfc8f2c
1 parent 38966b8
commit bfc8f2c
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 9 deletions.
diff --git a/src/main/scala/code/snippet/UserSnips.scala b/src/main/scala/code/snippet/UserSnips.scala
@@ -340,7 +340,11 @@ object UserLogin extends Loggable with SnippetHelper {
                 User.logUserIn(user, true)
                 if (remember) User.createExtSession(user.id.get)
                 else ExtSession.deleteExtCookie()
-                RedirectTo("/")
+
+                if ((user.roles.get contains "Usuario") && !(referer contains "login"))
+                  RedirectTo(referer);
+                else
+                  RedirectTo("/dashboard")
               } else {
                 S.error("login_err", "Aun falta validar esta cuenta. Porfavor revise su correo electronico para terminar el proceso.")
                 Noop

diff --git a/src/main/webapp/backend/record/event-form-page.html b/src/main/webapp/backend/record/event-form-page.html
@@ -1,5 +1,29 @@
 <div data-lift="surround?with=base-wrap-backend;at=content">
     <div class="col-md-12" ng-app="EventApp">
+        <div ng-show='loading' class='on-loading'>
+          <img src="/images/ajax-loader.gif" width="25" height="25" />
+        </div>
+        <script>
+          $(document).ready(function () {
+            $('#terms-agreement').modal({
+              keyboard: false,
+              backdrop: false
+            });
+
+            $('#button-ok').hide().click(function () {
+                  $('#terms-agreement').modal('hide');
+            });
+            $('#terms-agreement input').click (function () {
+              if ($(this).prop('checked')) {
+                $('#button-ok').fadeIn();
+              } else {
+                $('#button-ok').fadeOut();
+              }
+            })
+
+
+          });
+        </script>
         <div class="notifications margin-bottom-xs ">
         </div>
         <header class="page-header">
@@ -9,6 +33,46 @@ <h2 class="no-margin-top title-page">
         </header>
 
         <div id="event-wizard" ng-controller="EventController">
+
+            <div id='terms-agreement' class='modal fade' tabindex='-1' role='dialog'>
+              <div class='modal-dialog' role='document'>
+                <div class='modal-content'>
+                  <div class='modal-header'>
+                    <h3>
+                      Importante
+                    </h3>
+                  </div>
+                  <div class='modal-body'>
+                    <p>La solicitud de un evento en el Proyecto mARTadero no implica su automática aprobación.
+                    </p>
+                    <p>
+                    Ten en cuenta que: 
+                    <ul>
+                      <li>
+                        Una vez realizada la solicitud para por la evaluación de la coordinación de área.
+                      </li>
+                      <li>
+                        En caso de ser aprobada se revisará la cotización que realizará el sistema y los datos que hayas ingresado por si hubiese alguna corrección pertinente.
+                      </li>
+                    </ul>
+                    </p>
+                    <p class='text-center'>
+                       <label>
+                         <input type='checkbox'>
+                         He leído y entendido ésta información
+                       </label>
+                    </p>
+                    <p class='text-center'>
+                      <a id='button-ok' type='button' ng-click='myFunc()' class='btn btn-primary'>
+                        Continuar
+                      </a>
+                    </p>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+
             <div class="navbar wizard-nav">
                 <div class="navbar-inner">
                     <ul class="nav nav-pills">

diff --git a/src/main/webapp/js/EventController.js b/src/main/webapp/js/EventController.js
@@ -1,10 +1,16 @@
 angular.module('EventApp', ['federica.event', 'ui.bootstrap'])
+
   .controller('EventController', function ($scope, $log, EventService) {
+  $scope.loading = true;
   $scope.rooms = [];
   $scope.event = {};
   $scope.currentTab = 'rooms';
   $scope.shifts = ['Mañana', 'Tarde', 'Noche'];
 
+  var endLoadingCounter = 0;
+
+
+
   $scope.switchRoom = function(room) {
     if (_.includes($scope.event.rooms, room)) {
       _.remove($scope.event.rooms, function(r) {
@@ -152,12 +158,29 @@ angular.module('EventApp', ['federica.event', 'ui.bootstrap'])
 
       return '';
     };
+    $scope.myFunc = function() {
+      console.log ("Continuing... Loading Event");
+      EventService.fetchEvent().then(function(response) {
+        $scope.event = response;
+        endLoading();
+
+      });
+      EventService.listRooms().then(function(response) {
+        $scope.rooms = response;
+        endLoading();
+      });
+    };
 
   //init
-  EventService.fetchEvent().then(function(response) {
-    $scope.event = response;
-  });
-  EventService.listRooms().then(function(response) {
-    $scope.rooms = response;
-  });
-});
+  //
+  //
+
+
+  function endLoading () {
+    endLoadingCounter++;
+    if (endLoadingCounter >= 2 ) {
+      $scope.loading = false;
+    }
+  }
+});
+
diff --git a/src/main/webapp/js/martadero.js b/src/main/webapp/js/martadero.js
@@ -20,4 +20,4 @@ $(document).ready(function(){
             $loginBox.slideUp();
         }
     });
-});
+});
diff --git a/src/main/webapp/styles/styles.less b/src/main/webapp/styles/styles.less
@@ -5,3 +5,19 @@ form .section-costs {
   }
   margin-top: 5em;
 }
+
+.on-loading {
+  position: absolute;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  background: rgba(255,255,255,0.75);
+  z-index: 100;
+}
+
+.on-loading > img {
+  position: absolute;
+  left: 45%;
+  top:45%;
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,4 @@ $(document).ready(function(){ @@
                 $loginBox.slideUp();
             }
         });
-    });
+    });