Asdf

Dockerfile

@@ -14,8 +14,6 @@ COPY . /src
 WORKDIR /src
 
 
-RUN npm install
-
 #node inspector port
 EXPOSE 9000
 

README.md

@@ -0,0 +1,2 @@
+# userrecstudy
+Recommended System User Study Mini Project

client/app/result/result.controller.js

@@ -10,25 +10,50 @@ angular.module('recuserstudyApp')
     $scope.withoutImagesUsers = [1,1,1,1,1,1,1];
     $scope.totalUsers = [1,1,1,1,1,1,1];
 
-    $http.get('/api/movies/getStats')
-      .success(function (res) {
-        $scope.stats = res;
-        $scope.totalRecommendations = [res.users.chosen, res.users.amount - res.users.chosen];
-        $scope.withImages = [res.withImages.chosen, res.withImages.amount - res.withImages.chosen];
-        $scope.withoutImages = [res.withoutImages.chosen, res.withoutImages.amount - res.withoutImages.chosen];
-        $scope.withImagesUsers = [res.withImages["15-25"], res.withImages["26-35"], res.withImages["36-45"], res.withImages["46-55"], res.withImages["56-65"], res.withImages["66-75"], res.withImages["76-85"]];
-        $scope.withoutImagesUsers = [res.withoutImages["15-25"], res.withoutImages["26-35"], res.withoutImages["36-45"], res.withoutImages["46-55"], res.withoutImages["56-65"], res.withoutImages["66-75"], res.withoutImages["76-85"]];
-        $scope.totalUsers = [res.users["15-25"], res.users["26-35"], res.users["36-45"], res.users["46-55"], res.users["56-65"], res.users["66-75"], res.users["76-85"]];
-        $scope.loading = false;
-      })
-      .error(function(err){
-        Modal.confirm.info(function () {
-          $scope.loading = false;
-        })("Error", err, "Ok");
-      });
-
     $scope.labels1 = ["chose a recommendation", "did not choose a recommendation"];
     $scope.labels2 = ["15-25", "26-35", "36-45", "46-55", "56-65", "66-75", "76-85"];
     $scope.colors = ['#FD1F5E','#1EF9A1'];
 
+    $scope.initial = function() {
+      $http.get('/api/movies/getStats')
+        .then(function (res) {
+          res = res.data;
+          $scope.stats = res;
+          $scope.totalRecommendations = [res.users.chosen, res.users.amount - res.users.chosen];
+          $scope.withImages = [res.withImages.chosen, res.withImages.amount - res.withImages.chosen];
+          $scope.withoutImages = [res.withoutImages.chosen, res.withoutImages.amount - res.withoutImages.chosen];
+          $scope.withImagesUsers = [res.withImages["15-25"], res.withImages["26-35"], res.withImages["36-45"], res.withImages["46-55"], res.withImages["56-65"], res.withImages["66-75"], res.withImages["76-85"]];
+          $scope.withoutImagesUsers = [res.withoutImages["15-25"], res.withoutImages["26-35"], res.withoutImages["36-45"], res.withoutImages["46-55"], res.withoutImages["56-65"], res.withoutImages["66-75"], res.withoutImages["76-85"]];
+          $scope.totalUsers = [res.users["15-25"], res.users["26-35"], res.users["36-45"], res.users["46-55"], res.users["56-65"], res.users["66-75"], res.users["76-85"]];
+        })
+        .then(function(){
+          return $http.get('api/movies/getUsers')
+        })
+        .then(function(res){
+          $scope.users = res.data;
+          $scope.loading = false;
+        })
+        .catch(function(err){
+          Modal.confirm.info(function () {
+            $scope.loading = false;
+          })("Error", err, "Ok");
+        });
+    };
+
+    $scope.deleteAll = function() {
+      $scope.loading = true;
+
+      $http.post('/api/movies/deleteAll')
+        .then(function(){
+          $scope.initial();
+        })
+        .catch(function(err){
+          Modal.confirm.info(function () {
+            $scope.loading = false;
+          })("Error", err, "Ok");
+        })
+    };
+
+    $scope.initial();
+
   });

client/app/result/result.html

@@ -56,6 +56,30 @@ <h4>Total recommendations viewed by participants: {{stats.withoutImages.amount}}
       </div>
     </div>
 
+    <div class="divider"></div>
+
+    <div class="row">
+      <table class="table table-striped">
+        <thead>
+        <tr>
+          <th>BGU user</th>
+          <th>Date</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr ng-repeat="user in users">
+          <td>{{user.bgu}}</td>
+          <td>{{user.date}}</td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+
+    <div class="divider"></div>
+
+    <button class="btn btn-danger text-center" ng-click="deleteAll()" ng-show="false">Delete All Data</button>
+
+
   </div>
 </div>
 

client/app/step1/step1.html

@@ -3,7 +3,7 @@
   <div class="row text-center">
     <h3 ng-show="!userMovies.length">Please pick your favorite movies from the following list by clicking on them</h3>
     <h3 ng-show="userMovies.length && userMovies.length < 10">Please choose {{10 - userMovies.length}} more movies that you like</h3>
-    <h3><button class="btn btn-primary btn-lg" ng-show="userMovies.length === 10" ui-sref="step2({recId:1})">Continue to next step&nbsp&nbsp<span class="glyphicon glyphicon glyphicon-ok" aria-hidden="true"></span></button></h3>
+    <h3><button class="btn btn-primary btn-lg" ng-show="userMovies.length === 10" ui-sref="step2({recId:1})">Continue to next step&nbsp&nbsp<span class="glyphicon glyphicon-arrow-right" aria-hidden="true"></span></button></h3>
     <br>
   </div>
 

client/components/modal/form.html

@@ -17,13 +17,13 @@ <h4 ng-if="modal.title" ng-bind-html="modal.title" class="modal-title"></h4>
       <span><b>Your age:</b></span>
       <select class="form-control" ng-model="modal.age">
         <option value="age">Age</option>
-        <option value="15-25">15-20</option>
-        <option value="26-35">21-25</option>
-        <option value="36-45">26-30</option>
-        <option value="46-55">31-35</option>
-        <option value="56-65">36-40</option>
-        <option value="66-75">41-45</option>
-        <option value="76-85">46-50</option>
+        <option value="15-25">15-25</option>
+        <option value="26-35">26-35</option>
+        <option value="36-45">36-45</option>
+        <option value="46-55">46-55</option>
+        <option value="56-65">56-65</option>
+        <option value="66-75">66-75</option>
+        <option value="76-85">76-85</option>
       </select>
       <br>
       <span><b>BGU user:</b></span>

client/components/modal/modal.service.js

@@ -61,7 +61,7 @@ angular.module('recuserstudyApp')
                   text: continueText,
                   click: function(e) {
                     deleteModal.dismiss(e);
-                    del.apply(event, args);
+                    del.apply(e, args);
                   }
                 }]
               }
@@ -96,12 +96,12 @@ angular.module('recuserstudyApp')
                 buttons: [{
                   classes: 'btn-primary',
                   text: continueText,
-                  click: function(e, age, gender, bgu) {
+                  click: function(e, age, gender, user, bgu) {
                     Movies.age = age;
                     Movies.gender = gender;
                     Movies.bgu = bgu;
                     deleteModal.dismiss(e);
-                    del.apply(event, args);
+                    del.apply(e, args);
                   }
                 }]
               }
@@ -135,7 +135,7 @@ angular.module('recuserstudyApp')
                   text: continueText,
                   click: function(e) {
                     deleteModal.dismiss(e);
-                    del.apply(event, args);
+                    del.apply(e, args);
                   }
                 },
                   {