Skip to content

Q
QLNS_N01
Commit 424c818d authored by Phạm Duy Phi's avatar Phạm Duy Phi
Browse files
Options

no message

parent afbac0e6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 508 additions and 45177 deletions
src/main/java/com/itsol/quantrivanphong/report/timesheet/business/TimeSheetBusiness.java
View file @ 424c818d
......@@ -74,23 +74,19 @@ public class TimeSheetBusiness {
@Transactional
public String updateTimeSheet(TimeSheetDTO timeSheetDTO) {
String message;
Employee employee = employeeRepository.findEmployeeById(timeSheetDTO.getEmployeeId());
Eproject eproject = eProjectRepository.findEprojectByEmployee(employee);
TimeSheet timeSheet = timeSheetRepository.findTimeSheetByEprojectAndId(eproject, timeSheetDTO.getId());
if (eproject != null) {
if (timeSheet != null) {
int i = timeSheetRepository.updateTimeSheet(timeSheetDTO.getTitle(), timeSheetDTO.getContent()
, timeSheetDTO.getNote(), timeSheetDTO.getId());
if (i == 1) {
message = "Update success";
} else {
message = "Update failed";
}
// Employee employee = employeeRepository.findEmployeeById(timeSheetDTO.getEmployeeId());
// Eproject eproject = eProjectRepository.findEprojectByEmployee(employee);
TimeSheet timeSheet = timeSheetRepository.findTimeSheetById(timeSheetDTO.getId());
if (timeSheet != null) {
int i = timeSheetRepository.updateTimeSheet(timeSheetDTO.getTitle(), timeSheetDTO.getContent()
, timeSheetDTO.getNote(), timeSheetDTO.getId());
if (i == 1) {
message = "Update success";
} else {
message = "TimeSheet does not exist";
message = "Update failed";
}
} else {
message = "Eproject does not exist";
message = "TimeSheet does not exist";
}
return message;
}
......@@ -107,24 +103,6 @@ public class TimeSheetBusiness {
return message;
}
// @Transactional
// public String updateLeaveFormStatus(TimeSheetDTO timeSheetDTO) {
// String message;
// TimeSheet timeSheet = timeSheetRepository.findTimeSheetByEmployeeId(timeSheetDTO.getId());
// if (timeSheet != null) {
// int i = timeSheetRepository.updateTimeSheetStatus(timeSheetDTO.isStatus(), timeSheetDTO.getId());
// if (i == 1) {
// message = "Update status success";
// } else {
// message = "Update status failed";
// }
// } else {
// message = "TimeSheet does not exist";
// }
//
// return message;
// }
public List<TimeSheet> findTimeSheetByEmployeeId(int employeeId) {
Employee employee = employeeRepository.findEmployeeById(employeeId);
Eproject eproject = eProjectRepository.findEprojectByEmployee(employee);
......
src/main/resources/public/blank-page.html deleted 100644 → 0
View file @ afbac0e6
This diff is collapsed.
src/main/resources/public/buttons.html deleted 100644 → 0
View file @ afbac0e6
This diff is collapsed.
src/main/resources/public/compose.html deleted 100644 → 0
View file @ afbac0e6
This diff is collapsed.
src/main/resources/public/forms.html deleted 100644 → 0
View file @ afbac0e6
This diff is collapsed.
src/main/resources/public/general.html deleted 100644 → 0
View file @ afbac0e6
This diff is collapsed.
src/main/resources/public/grids.html deleted 100644 → 0
View file @ afbac0e6
This diff is collapsed.
src/main/resources/public/icons.html deleted 100644 → 0
View file @ afbac0e6
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/resources/public/inbox.html deleted 100644 → 0
View file @ afbac0e6
This diff is collapsed.
src/main/resources/public/index.html
View file @ 424c818d
This diff is collapsed.
src/main/resources/public/js/angular.js
View file @ 424c818d
This diff is collapsed.
src/main/resources/public/js/app.js
View file @ 424c818d
This diff is collapsed.
src/main/resources/public/layout/layout1.html
View file @ 424c818d
......@@ -3,6 +3,7 @@
<a ui-sref="employees"></a>
<!-- <a ui-sref="report"></a>-->
<!-- <a ui-sref="project"></a>-->
<a ui-sref="timeSheet"></a>
<div ui-view="content">
</div>
......
src/main/resources/public/layout/layout3.html
View file @ 424c818d
......@@ -10,7 +10,7 @@
<div class="container-fluid">
<!-- Content -->
<div ui-view="layout">
<div ui-view="content">
</div>
<!-- footer -->
......
src/main/resources/public/login.html deleted 100644 → 0
View file @ afbac0e6
This diff is collapsed.
src/main/resources/public/media.html deleted 100644 → 0
View file @ afbac0e6
This diff is collapsed.
src/main/resources/public/pages/leaveform/leaveForm.html
View file @ 424c818d
......@@ -16,7 +16,7 @@
<div class="table-title">
<div class="row">
<div class="col-sm-6">
<h2><b>Leave Form</b></h2>
<h4><b>Leave Form</b></h4>
<label>
Search: <input type="text" ng-model="search" placeholder="Search" style="color: black; margin: 10px"/>
</label>
......@@ -27,7 +27,7 @@
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="col-md-11">
<div id="addDivLF" style="display: none">
<h2><b>Add Leave Form</b></h2>
<table class="table table-striped table-hover">
......
src/main/resources/public/pages/timesheet/timeSheet.html
View file @ 424c818d
......@@ -16,7 +16,7 @@
<div class="table-title">
<div class="row">
<div class="col-sm-6">
<h2><b>TimeSheet</b></h2>
<h4><b>TimeSheet</b></h4>
<label>
Search: <input type="text" ng-model="search" placeholder="Search" style="color: black; margin: 10px"/>
</label>
......@@ -27,7 +27,7 @@
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="col-md-11">
<div id="addDivTS" style="display: none">
<h2><b>Add TimeSheet</b></h2>
<table class="table table-striped table-hover">
......@@ -125,7 +125,7 @@
</tr>
</thead>
<tbody>
<tr class="tss" ng-repeat="ts in myTimeSheets | limitTo:numLimit:start | filter: search">
<tr class="tss" ng-repeat="ts in myTimeSheets | filter: search">
<td>{{$index + 1}}</td>
<td>{{ts.title}}</td>
<td>{{ts.content}}</td>
......@@ -133,9 +133,9 @@
<td>{{ts.eproject.project.name}}</td>
<td>{{ts.updatedAt}}</td>
<td><a ui-sref="timeSheetDetail({id: ts.id})"data-toggle="modal"><i class="fa fa-eye" data-toggle="tooltip" title="View"></i></a></td>
<td><a ui-sref="timeSheet" ng-click="getTs(ts);" onclick="document.getElementById('updateDivTS').style.display = 'block'"class="edit" data-toggle="modal"><i class="material-icons" data-toggle="tooltip" title="Edit">&#xE254;</i></a></td>
<td><a ui-sref="timeSheet" ng-click="delete(ts);"class="delete" data-toggle="modal"><i class="material-icons" data-toggle="tooltip" title="Delete">&#xE872;</i></a></td>
<td><a ui-sref="timeSheetDetail({id: ts.id})" data-toggle="modal"><i class="fa fa-eye" data-toggle="tooltip" title="View"></i></a></td>
<td><a ui-sref="timeSheet" ng-click="getTs(ts);" onclick="document.getElementById('updateDivTS').style.display = 'block'" class="edit" data-toggle="modal"><i class="material-icons" data-toggle="tooltip" title="Edit">&#xE254;</i></a></td>
<td><a ui-sref="timeSheet" ng-click="delete(ts);" class="delete" data-toggle="modal"><i class="material-icons" data-toggle="tooltip" title="Delete">&#xE872;</i></a></td>
</tr>
<!-- <tr>-->
<!-- <h6><code>rotate</code> defaulted to <code>true</code> and <code>force-ellipses</code> set to <code>true</code>:</h6>-->
......
src/main/resources/public/pages/timesheet/timesheet.html
View file @ 424c818d
......@@ -16,7 +16,7 @@
<div class="table-title">
<div class="row">
<div class="col-sm-6">
<h2><b>TimeSheet</b></h2>
<h4><b>TimeSheet</b></h4>
<label>
Search: <input type="text" ng-model="search" placeholder="Search" style="color: black; margin: 10px"/>
</label>
......@@ -27,7 +27,7 @@
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="col-md-11">
<div id="addDivTS" style="display: none">
<h2><b>Add TimeSheet</b></h2>
<table class="table table-striped table-hover">
......@@ -125,7 +125,7 @@
</tr>
</thead>
<tbody>
<tr class="tss" ng-repeat="ts in myTimeSheets | limitTo:numLimit:start | filter: search">
<tr class="tss" ng-repeat="ts in myTimeSheets | filter: search">
<td>{{$index + 1}}</td>
<td>{{ts.title}}</td>
<td>{{ts.content}}</td>
......@@ -133,9 +133,9 @@
<td>{{ts.eproject.project.name}}</td>
<td>{{ts.updatedAt}}</td>
<td><a ui-sref="timeSheetDetail({id: ts.id})"data-toggle="modal"><i class="fa fa-eye" data-toggle="tooltip" title="View"></i></a></td>
<td><a ui-sref="timeSheet" ng-click="getTs(ts);" onclick="document.getElementById('updateDivTS').style.display = 'block'"class="edit" data-toggle="modal"><i class="material-icons" data-toggle="tooltip" title="Edit">&#xE254;</i></a></td>
<td><a ui-sref="timeSheet" ng-click="delete(ts);"class="delete" data-toggle="modal"><i class="material-icons" data-toggle="tooltip" title="Delete">&#xE872;</i></a></td>
<td><a ui-sref="timeSheetDetail({id: ts.id})" data-toggle="modal"><i class="fa fa-eye" data-toggle="tooltip" title="View"></i></a></td>
<td><a ui-sref="timeSheet" ng-click="getTs(ts);" onclick="document.getElementById('updateDivTS').style.display = 'block'" class="edit" data-toggle="modal"><i class="material-icons" data-toggle="tooltip" title="Edit">&#xE254;</i></a></td>
<td><a ui-sref="timeSheet" ng-click="delete(ts);" class="delete" data-toggle="modal"><i class="material-icons" data-toggle="tooltip" title="Delete">&#xE872;</i></a></td>
</tr>
<!-- <tr>-->
<!-- <h6><code>rotate</code> defaulted to <code>true</code> and <code>force-ellipses</code> set to <code>true</code>:</h6>-->
......
src/main/resources/public/signup.html deleted 100644 → 0
View file @ afbac0e6
This diff is collapsed.
src/main/resources/public/timesheet.html deleted 100644 → 0
View file @ afbac0e6
This diff is collapsed.
src/main/resources/public/typography.html deleted 100644 → 0
View file @ afbac0e6
This diff is collapsed.
src/main/resources/public/validation.html deleted 100644 → 0
View file @ afbac0e6
This diff is collapsed.
src/main/resources/public/widgets.html deleted 100644 → 0
View file @ afbac0e6
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment