-
+
{{ getDateTotal(date) }}
{{ getGrandTotal() }}
diff --git a/public/app/features/timesheets/test/timesheet-controller.test.js b/public/app/features/timesheets/test/timesheet-controller.test.js
index 99b7892d..87208049 100644
--- a/public/app/features/timesheets/test/timesheet-controller.test.js
+++ b/public/app/features/timesheets/test/timesheet-controller.test.js
@@ -164,5 +164,25 @@ define([
expect($scope.processing).toBe(undefined);
});
+
+ it('should return the job name by id', () => {
+ $scope.jobs = [
+ { id: 1, name: 'Job 1' },
+ { id: 2, name: 'Job 2' },
+ { id: 3, name: 'Job 3' }
+ ];
+
+ expect($scope.getJobName(2)).toEqual('Job 2');
+ });
+
+ it('should not return the job name if no id is provided', () => {
+ $scope.jobs = [
+ { id: 1, name: 'Job 1' },
+ { id: 2, name: 'Job 2' },
+ { id: 3, name: 'Job 3' }
+ ];
+
+ expect($scope.getJobName()).toEqual('');
+ });
});
});
diff --git a/public/app/features/timesheets/test/timesheets.e2e.js b/public/app/features/timesheets/test/timesheets.e2e.js
index 7373df38..ad242de5 100644
--- a/public/app/features/timesheets/test/timesheets.e2e.js
+++ b/public/app/features/timesheets/test/timesheets.e2e.js
@@ -6,4 +6,22 @@ describe('Time Management', () => {
it('should have a time entry screen', () => {
expect($('h2').getText()).toEqual('May 1 - 15');
});
+
+ it('should not be able to enter time until job code is selected', () => {
+ page.forAllInputFields(field => {
+ expect(field.isEnabled()).toBe(true);
+ });
+ });
+
+ it('should enter time and show accurate totals for a day', () => {
+
+ });
+
+ it('should enter time and show accurate totals for a specific job code', () => {
+
+ });
+
+ it('should save the entered time and show save success message', () => {
+
+ });
});
diff --git a/public/app/features/timesheets/test/timesheets.page.js b/public/app/features/timesheets/test/timesheets.page.js
index 5af90946..687d27d6 100644
--- a/public/app/features/timesheets/test/timesheets.page.js
+++ b/public/app/features/timesheets/test/timesheets.page.js
@@ -6,8 +6,13 @@ class Timesheet extends Page {
constructor() {
super();
this.url = '/#!/timesheets';
+ this.inputFields = $$('input');
}
+ forAllInputFields(cb) {
+ this.fields.each(field => cb(field));
+ }
+
}
module.exports = new Timesheet();
diff --git a/public/app/features/timesheets/timesheets.js b/public/app/features/timesheets/timesheets.js
index 0ae83803..fb854da6 100644
--- a/public/app/features/timesheets/timesheets.js
+++ b/public/app/features/timesheets/timesheets.js
@@ -4,7 +4,7 @@ define([
'components/components',
'components/services/data-service'
], angular => {
- function TimesheetsController($scope, data) {
+ function TimesheetsController($scope, data, $filter) {
function getLastDayOfMonth(month, year) {
return new Date(year, month, 0).getDate();
}
@@ -29,6 +29,12 @@ define([
$scope.timeEntryObj = { periodStart: dates[0], timeEntrySets: rows };
+ $scope.processing = true;
+ data.jobs.query(jobs => {
+ $scope.jobs = jobs;
+ delete $scope.processing;
+ });
+
$scope.saveTime = () => {
$scope.processing = true;
delete $scope.submitError;
@@ -66,6 +72,8 @@ define([
return total;
};
+ $scope.getJobName = id => id ? $filter('filter')($scope.jobs, { id }, true)[0].name : '';
+
}
angular.module('flash.timesheets', ['ngResource', 'ngRoute'])
diff --git a/public/app/features/timesheets/timesheets.less b/public/app/features/timesheets/timesheets.less
index 3d975a4b..a3cd8e23 100644
--- a/public/app/features/timesheets/timesheets.less
+++ b/public/app/features/timesheets/timesheets.less
@@ -68,10 +68,6 @@
border-radius: 5px;
text-align: center;
}
- textarea {
- border: none;
- border-bottom: 2px solid @dark-blue;
- }
&.total {
text-align: center;
font-size: 1.4em;
diff --git a/public/assets/css/main.css b/public/assets/css/main.css
index 888bf686..95770abe 100644
--- a/public/assets/css/main.css
+++ b/public/assets/css/main.css
@@ -190,10 +190,6 @@
border-radius: 5px;
text-align: center;
}
-#time-entry-view div.table-rows div textarea {
- border: none;
- border-bottom: 2px solid #0070bb;
-}
#time-entry-view div.table-rows div.total {
text-align: center;
font-size: 1.4em;
diff --git a/public/coverage/PhantomJS 2.1.1 (Linux 0.0.0)/app/app.js.html b/public/coverage/PhantomJS 2.1.1 (Linux 0.0.0)/app/app.js.html
index f6c2eea1..29a6f996 100644
--- a/public/coverage/PhantomJS 2.1.1 (Linux 0.0.0)/app/app.js.html
+++ b/public/coverage/PhantomJS 2.1.1 (Linux 0.0.0)/app/app.js.html
@@ -175,7 +175,7 @@