Skip to content

Commit

Permalink
Simple timesheet updating working, backend relationship seems to be w…
Browse files Browse the repository at this point in the history 
…orking fine, refactored some minor backend code
  • Loading branch information
@gpfunk
gpfunk committed Mar 16, 2014
1 parent 206e5d9 commit 46b4634
Show file tree
Hide file tree
Showing 9 changed files with 121 additions and 166 deletions.
18 changes: 7 additions & 11 deletions src/main/java/ca/bcit/infosys/comp4911/application/SampleData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ public void populateData() {
generateProjectAssignments();
generateWorkPackages();
//generateWorkPackageAssignments();
//generateTimesheets();
generateTimesheets();
}

private void generateUsers() {
userDao.create(new User(
"username0@example.com","password","Bruce","Link",new Date(),true,"MIA",40,0,0,0,0,0,0, PLevel.P5
"q","q","Bruce","Link",new Date(),true,"MIA",40,0,0,0,0,0,0, PLevel.P5
));
userDao.create(new User(
"q","q","Bruce","Link",new Date(),true,"MIA",40,0,0,0,0,0,0, PLevel.P5
"username0@example.com","password","Bruce","Link",new Date(),true,"MIA",40,0,0,0,0,0,0, PLevel.P5
));

Date startDate = setDate(1, 1, 2000);
Expand Down Expand Up @@ -156,7 +156,7 @@ private void generateWorkPackages() {

issueDate = setDate(11, 10, 2013);
endDate = setDate(11, 28, 2013);

workPackageDao.create(new WorkPackage(
"A3334444", "Design Database", issueDate, "100", endDate, 55522, 25000));

Expand Down Expand Up @@ -222,7 +222,7 @@ private void generateProjectAssignments()
true
));
}
/**

private void generateTimesheets() {

Timesheet timesheet;
Expand All @@ -235,17 +235,13 @@ private void generateTimesheets() {
List<TimesheetRow> rows = timesheet.getTimesheetRows();
for(int i = 0; i < 5; i++)
{
TimesheetRow temp = new TimesheetRow(i, i, i, i, i, i, i, i, i, "hi" + i);
TimesheetRow temp = new TimesheetRow(i, "" + i, i, i, i, i, i, i, i, "hi" + i);
timesheetRowDao.create(temp);
temp.setTimesheet(timesheet);
rows.add(temp);
}
}
}
}
*/


private Date setDate(int month, int day, int year)
{
Expand Down
36 changes: 13 additions & 23 deletions src/main/java/ca/bcit/infosys/comp4911/domain/Timesheet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ public class Timesheet implements Serializable {
private int overTime;

@Column
private boolean isApproved;
private boolean approved;

@Column
private boolean isSigned;
private boolean signed;

@Column
private int userId;
Expand All @@ -63,19 +63,17 @@ public void setTimesheetRows(List<TimesheetRow> timesheetRows) {
}

public boolean isApproved() {
return isApproved;
return approved;
}

public void setApproved(boolean isApproved) {
this.isApproved = isApproved;
}
public void setApproved(boolean approved) { this.approved = approved; }

public boolean isSigned() {
return isSigned;
return signed;
}

public void setSigned(boolean isSigned) {
this.isSigned = isSigned;
public void setSigned(boolean signed) {
this.signed = signed;
}

public Integer getId() {
Expand Down Expand Up @@ -126,14 +124,6 @@ public void setYear(final int year) {
this.year = year;
}

public boolean getIsApproved() {
return this.isApproved;
}

public void setIsApproved(final boolean isApproved) {
this.isApproved = isApproved;
}

public int getUserId() {
return userId;
}
Expand Down Expand Up @@ -173,8 +163,8 @@ public Timesheet(int userId, int weekNumber, int year, int flexTime, int overTim
this.year = year;
this.flexTime = flexTime;
this.overTime = overTime;
this.isApproved = isApproved;
this.isSigned = isSigned;
this.approved = isApproved;
this.signed = isSigned;
timesheetRows = new ArrayList<TimesheetRow>();
}

Expand All @@ -184,8 +174,8 @@ public Timesheet(int userId, List<TimesheetRow> rows, int weekNumber, int year,
this.year = year;
this.flexTime = flexTime;
this.overTime = overTime;
this.isApproved = isApproved;
this.isSigned = isSigned;
this.approved = isApproved;
this.signed = isSigned;
timesheetRows = rows;
}

Expand All @@ -202,8 +192,8 @@ public String toString() {
result += ", year: " + year;
result += ", flexTime: " + flexTime;
result += ", overTime: " + overTime;
result += ", isApproved: " + isApproved;
result += ", isSigned: " + isSigned;
result += ", approved: " + approved;
result += ", signed: " + signed;
return result;
}
}
11 changes: 8 additions & 3 deletions src/main/java/ca/bcit/infosys/comp4911/domain/TimesheetRow.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ public class TimesheetRow implements Serializable
@Column
private int projectNumber;

private int total;

public Integer getId()
{
return this.id;
Expand Down Expand Up @@ -166,6 +168,12 @@ public void setNote(String note)
this.note = note;
}

public void setTotal(int total ) { this.total = total; }

public int getTotal(){
return monday + tuesday + wednesday + thursday + friday + saturday + sunday;
}

@Override
public boolean equals(Object that)
{
Expand Down Expand Up @@ -245,7 +253,4 @@ public String toString()
return result;
}

public int getTotal(){
return monday + tuesday + wednesday + thursday + friday + saturday + sunday;
}
}
183 changes: 60 additions & 123 deletions src/main/webapp/Partials/timesheet.html
View file
Original file line number Diff line number Diff line change
@@ -1,128 +1,65 @@
<content>
<div class="row">
<h1 class="secondary col-xs-4">TimeSheet</h1>
<ul class="list-inline col-xs-8 emp-info">
<li>Emp ID: A00111111</li>
<li>Emp Name: John Doe</li>
</ul>
</div>
<div class="row">
<div class="table-responsive timesheet">
<ul class="list-inline timesheet-nav">
<li>&lt; Week</li>
<li class="bg-tertiary">Today</li>
<li>Week &gt;</li>
<div ng-controller="TimesheetController">
<div class="row">
<h1 class="secondary col-xs-4">TimeSheet</h1>
<ul class="list-inline col-xs-8 emp-info">
<li>Emp ID: {{user.id}}</li>
<li>Emp Name: {{user.firstName}} {{user.lastName}}</li>
</ul>

<table class="table table-hover table-striped table-bordered">
<tbody>
<tr>
<th>Project No</th>
<th>WP No</th>
<th>Sat</th>
<th>Sun</th>
<th>Mon</th>
<th>Tue</th>
<th>Wed</th>
<th>Thu</th>
<th>Fri</th>
<th>Total</th>
<th>Delete</th>
</tr>
<tr>
<td><select><option>Foo</option><option>Bar</option></select></td>
<td><select><option>Foo</option><option>Bar</option></select></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td><a href="#">Delete</a></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td><a href="#">Delete</a></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td><a href="#">Delete</a></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td><a href="#">Delete</a></td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td><a href="#">Delete</a></td>
</tr>
<tr>
<td>Total</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
</tbody>
</table>
<footer>
<p class="col-xs-4">Overtime: </p>
<p class="col-xs-4">Flextime: </p>
<button class="btn btn-primary">Add new row</button>
</footer>
</div>
</div>
<footer class="row">
<div class="col-xs-6">
<p><input type="checkbox" /><span> Signature</span></p>
<p><input type="checkbox" /><span> Approve</span></p>
<div class="row">
<div class="table-responsive timesheet">
<ul class="list-inline timesheet-nav">
<li>&lt; Week</li>
<li class="bg-tertiary">Today</li>
<li>Week &gt;</li>
</ul>

<table class="table table-hover table-striped table-bordered">
<tbody>
<tr>
<th>Project No</th>
<th>WP No</th>
<th>Sat</th>
<th>Sun</th>
<th>Mon</th>
<th>Tue</th>
<th>Wed</th>
<th>Thu</th>
<th>Fri</th>
<th>Total</th>
<th>Delete</th>
</tr>
<tr ng-repeat="r in timesheet.timesheetRows">
<td><select ng-model="r.projectNumber" ng-change="listWP(r.projectNumber)" ng-options="p for p in projectNumbers"></select></td>
<td><select ng-model="r.workPackageNumber" ng-options="w for w in workPackageNumbers[r.projectNumber]"></select></td>
<td><input type="text" class="form-control" ng-model="r.saturday" /></td>
<td><input type="text" class="form-control" ng-model="r.sunday" /></td>
<td><input type="text" class="form-control" ng-model="r.monday" /></td>
<td><input type="text" class="form-control" ng-model="r.tuesday" /></td>
<td><input type="text" class="form-control" ng-model="r.wednesday" /></td>
<td><input type="text" class="form-control" ng-model="r.thursday" /></td>
<td><input type="text" class="form-control" ng-model="r.friday" /></td>
<td>{{total}}</td>
<td><a href="#">Delete</a></td>
</tr>
</tbody>
</table>
<footer>
<p class="col-xs-4">Overtime: {{timesheet.overTime}} </p>
<p class="col-xs-4">Flextime: {{timesheet.flexTime}} </p>
<button class="btn btn-primary">Add new row</button>
</footer>
</div>
</div>
<div class="col-xs-6">
<button class="btn btn-primary">Save</button>
</div>
</footer>
<footer class="row">
<div class="col-xs-6">
<p><input type="checkbox" ng-model="timesheet.signed" /><span> Signature</span></p>
<p><input type="checkbox" ng-model="timesheet.approved" /><span> Approve</span></p>
</div>
<div class="col-xs-6">
<button class="btn btn-primary" ng-click="save()">Save</button>
</div>
</footer>
</div>
</content>
2 changes: 1 addition & 1 deletion src/main/webapp/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ul class="nav navbar-nav">
<li><a href="#/project">Project</a></li>
<li><a href="#/manage-wp">WP Management</a></li>
<li><a href="#">TimeSheet</a></li>
<li><a href="#/timesheet">TimeSheet</a></li>
<li><a href="#">Report</a></li>
<li><a href="#/user-management-hr">User Management</a></li>
</ul>
Expand Down
3 changes: 2 additions & 1 deletion src/main/webapp/js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ cascadia.config(['$routeProvider', function($routeProvider) {
when('/manage-approver', {controller: 'ManageApproverController', templateUrl:'Partials/manage-approver.html'}).
when('/manage-project', {controller: 'ManageProjectController', templateUrl:'Partials/manage-project.html'}).
when('/project', {controller: 'ProjectManagementController', templateUrl:'Partials/project-management.html'}).
when('/timesheet', {controller: 'TimesheetController', templateUrl:'Partials/timesheet-management.html'}).
when('/timesheet-management', {controller: 'TimesheetController', templateUrl:'Partials/timesheet-management.html'}).
when('/timesheet', {controller: 'TimesheetController', templateUrl:'Partials/timesheet.html'}).
when('/user-management-hr', {controller: 'UsersManagementController', templateUrl:'Partials/user-management-hr.html'}).
when('/user-management-super', {controller: 'UsersManagementController', templateUrl:'Partials/user-management-super.html'}).
when('/user-profile/:id', {controller: 'UserProfileController', templateUrl:'Partials/user-profile.html'}).
Expand Down

0 comments on commit 46b4634

Please sign in to comment.