Save timestamps to server

Author: timothykang

js/api.js

@@ -120,7 +120,9 @@ angular.module('openeis-ui.api', ['ngResource'])
 })
 .service('Files', function ($resource, $http) {
     var Files = this,
-        resource = $resource(settings.API_URL + 'files/:fileId', { fileId: '@id' });
+        resource = $resource(settings.API_URL + 'files/:fileId', { fileId: '@id' }, {
+            update: { method: 'PATCH' },
+        });
 
     Files.get = function (fileId) {
         return resource.get({ fileId: fileId }).$promise;
@@ -130,6 +132,10 @@ angular.module('openeis-ui.api', ['ngResource'])
         return resource.query({ project: projectId }).$promise;
     };
 
+    Files.update = function (file) {
+        return resource.update(file).$promise;
+    };
+
     Files.head = function (fileId) {
         return $http({
             method: 'GET',

js/projects.js

@@ -109,12 +109,12 @@ angular.module('openeis-ui.projects', [
                 $scope.dataFiles[$index].cols.push(k);
             });
 
-            $scope.timestampsFile = $scope.dataFiles[$index];
+            $scope.timestampFile = $scope.dataFiles[$index];
         });
     };
 
-    $scope.closeTimestampsModal = function () {
-        delete $scope.timestampsFile;
+    $scope.closeTimestampModal = function () {
+        delete $scope.timestampFile;
     };
 
     $scope.upload = function (fileInput) {
@@ -180,10 +180,10 @@ angular.module('openeis-ui.projects', [
         });
     };
 })
-.controller('TimestampsCtrl', function ($scope, Files, $http) {
+.controller('TimestampCtrl', function ($scope, Files, $http) {
     $scope.modal = { columns: {}, };
 
-    $scope.previewTimestamps = function () {
+    $scope.preview = function () {
         $scope.selectedColumns = [];
 
         angular.forEach($scope.modal.columns, function (selected, column) {
@@ -194,7 +194,7 @@ angular.module('openeis-ui.projects', [
 
         $http({
             method: 'GET',
-            url: settings.API_URL + 'files/' + $scope.timestampsFile.id + '/timestamps?columns=' + $scope.selectedColumns.join(','),
+            url: settings.API_URL + 'files/' + $scope.timestampFile.id + '/timestamps?columns=' + $scope.selectedColumns.join(','),
             transformResponse: angular.fromJson,
         }).then(function (response) {
             $scope.modal.confirm = true;
@@ -204,10 +204,18 @@ angular.module('openeis-ui.projects', [
         });
     };
 
-    $scope.saveTimestamps = function () {
-        // TODO: Save timestamp to server
-        $scope.timestampsFile.timestamp = { columns: $scope.selectedColumns };
-        $scope.closeTimestampsModal();
+    $scope.save = function () {
+        var timestamp = { columns: $scope.selectedColumns };
+
+        Files.update({
+            id: $scope.timestampFile.id,
+            timestamp: timestamp,
+        }).then(function (file) {
+            $scope.timestampFile.timestamp = timestamp;
+            $scope.closeTimestampModal();
+        }, function (rejection) {
+            alert(angular.toJson(rejection));
+        });
     };
 })
 .controller('NewDataSetCtrl', function ($scope, DataSets, SensorMaps) {

partials/file-timestamps.html renamed to partials/file-timestamp.html

@@ -1,25 +1,25 @@
-<h4>{{timestampsFile.file}}</h4>
+<h4>{{timestampFile.file}}</h4>
 <div ng-if="!modal.confirm">
     <table class="table--file-preview">
         <thead>
             <tr>
-                <th colspan="{{timestampsFile.cols.length}}">Select columns that comprise timestamp:</th>
+                <th colspan="{{timestampFile.cols.length}}">Select columns that comprise timestamp:</th>
             <tr>
-                <th ng-repeat="col in timestampsFile.cols">
+                <th ng-repeat="col in timestampFile.cols">
                     <input type="checkbox" ng-model="modal.columns[$index]">
                 </th>
             </tr>
-            <tr ng-if="timestampsFile.head.header.length">
-                <th ng-repeat="header in timestampsFile.head.header"><label for="{{$index}}">{{header}}</label></th>
+            <tr ng-if="timestampFile.head.header.length">
+                <th ng-repeat="header in timestampFile.head.header"><label for="{{$index}}">{{header}}</label></th>
             </tr>
         </thead>
         <tbody>
-            <tr ng-repeat="row in timestampsFile.head.rows">
+            <tr ng-repeat="row in timestampFile.head.rows">
                 <td ng-repeat="col in row track by $index">{{col}}</td>
             </tr>
         </tbody>
     </table>
-    <button ng-click="previewTimestamps()">Continue</button> <button ng-click="closeTimestampsModal()">Cancel</button>
+    <button ng-click="preview()">Continue</button> <button ng-click="closeTimestampModal()">Cancel</button>
 </div>
 <div ng-if="modal.confirm">
     <h5>Timestamps</h5>
@@ -38,5 +38,5 @@ <h5>Timestamps</h5>
         </tbody>
     </table>
     <p>Are the parsed timestamps correct?</p>
-    <button ng-click="saveTimestamps()">Yes, save configuration</button> <button ng-click="modal.confirm = false">No, re-select columns</button>
+    <button ng-click="save()">Yes, save configuration</button> <button ng-click="modal.confirm = false">No, re-select columns</button>
 </div>

partials/project.html

@@ -33,8 +33,8 @@ <h3>Data files</h3>
                     </tr>
                 </tbody>
             </table>
-            <modal class="modal--file-timestamps" ng-if="timestampsFile">
-                <ng-include src="'partials/file-timestamps.html'" ng-controller="TimestampsCtrl"></ng-include>
+            <modal class="modal--file-timestamp" ng-if="timestampFile">
+                <ng-include src="'partials/file-timestamp.html'" ng-controller="TimestampCtrl"></ng-include>
             </modal>
         </div>
         <div class="layout">

scss/app.scss

@@ -202,7 +202,7 @@ nav {
     &--project {
         @extend %box;
 
-        .layout {
+        > .layout {
             display: flex;
             margin-right: -$inuit-base-spacing-unit;
         }