Skip to content

Commit 2e04c9c

Browse files
author
javaage
committed
sample finish
1 parent 0014046 commit 2e04c9c

22 files changed

Lines changed: 1114 additions & 1056 deletions

‎helloworld-springboot/src/main/UI/src/css/common.css‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,11 @@ input.ng-invalid {
1313

1414
input.ng-valid{
1515
border: 1px solid green;
16-
}
16+
}
17+
18+
ul{
19+
margin:0;
20+
padding: 0;
21+
}
22+
23+
ul li { list-style-type:none; }

‎helloworld-springboot/src/main/UI/src/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@
5858
<a href="#/employee">User <span class="menu-icon fa fa-users"></span></a>
5959
</li>
6060
<li class="sidebar-list">
61-
<a href="#/role">Role <span class="menu-icon fa fa-television"></span></a>
61+
<a href="#/role">Role <span class="menu-icon fa fa-certificate"></span></a>
6262
</li>
6363
<li class="sidebar-list">
64-
<a href="#/course">Course <span class="menu-icon fa fa-calendar"></span></a>
64+
<a href="#/course">Course <span class="menu-icon fa fa-calendar-times-o"></span></a>
6565
</li>
6666
<li class="sidebar-list">
67-
<a href="#/sample">Golden Sample<span class="menu-icon fa fa-table"></span></a>
67+
<a href="#/sample">Golden Sample<span class="menu-icon fa fa-university"></span></a>
6868
</li>
6969
</ul>
7070
<!--

‎helloworld-springboot/src/main/UI/src/js/controllers/course-ctrl.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ function OperateCourseCtrl($scope, $log,$uibModalInstance, services) {
121121
if($scope.isModify){
122122
services.updateCourse($scope.course).then(function(result) {
123123
if (result.code == 1) {
124+
$scope.getCourseList();
124125
$scope.closeCourseModal();
125126
}
126127
}, function (error) {

‎helloworld-springboot/src/main/UI/src/js/controllers/record-ctrl.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ function OperateRecordCtrl($scope, $log,$uibModalInstance, services) {
101101
if($scope.isModify){
102102
services.updateRecord($scope.record).then(function(result) {
103103
if (result.code == 1) {
104+
$scope.getRecordList();
104105
$scope.closeRecordModal();
105106
}
106107
}, function (error) {

‎helloworld-springboot/src/main/UI/src/js/controllers/role-ctrl.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ function OperateRoleCtrl($scope, $log,$uibModalInstance, services) {
101101
if($scope.isModify){
102102
services.updateRole($scope.role).then(function(result) {
103103
if (result.code == 1) {
104+
$scope.getRoleList();
104105
$scope.closeRoleModal();
105106
}
106107
}, function (error) {

‎helloworld-springboot/src/main/UI/src/js/controllers/sample-ctrl.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ function OperateGoldenSampleCtrl($scope, $log,$uibModalInstance, services) {
182182
if($scope.isModify){
183183
services.updateGoldenSample($scope.goldenSample).then(function(result) {
184184
if (result.code == 1) {
185+
$scope.getGoldenSampleList();
185186
$scope.closeGoldenSampleModal();
186187
}
187188
}, function (error) {

‎helloworld-springboot/src/main/UI/src/templates/course.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="row" data-ng-controller="CourseCtrl">
22
<div class="col-lg-12">
33
<rd-widget>
4-
<rd-widget-header icon="fa-television" title="Course">
4+
<rd-widget-header icon="fa-calendar-times-o" title="Course">
55

66
</rd-widget-header>
77

‎helloworld-springboot/src/main/UI/src/templates/role.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div class="row" data-ng-controller="RoleCtrl">
22
<div class="col-lg-12">
33
<rd-widget>
4-
<rd-widget-header icon="fa-television" title="Role">
5-
4+
5+
<rd-widget-header icon="fa-certificate" title="Role">
66
</rd-widget-header>
77
<input class="btn btn-default" type="button" ng-click="addRoleModal()" value="Add Role">
88
<rd-widget-body classes="large no-padding">

‎helloworld-springboot/src/main/UI/src/templates/sample.html‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="row" data-ng-controller="GoldenSampleCtrl">
22
<div class="col-lg-12">
33
<rd-widget>
4-
<rd-widget-header icon="fa-television" title="GoldenSample">
4+
<rd-widget-header icon="fa-university" title="GoldenSample1">
55

66
</rd-widget-header>
77

@@ -15,8 +15,20 @@
1515
<tr ng-repeat="item in $data" ng-class="{'inactive':!item.active}">
1616
<td title="'GoldenSample'" sortable="'goldenSampleName'" class="text-center">{{item.goldenSampleName}}</td>
1717
<td title="'Role'" sortable="'roleName'" class="text-center">{{item.roleName}}</td>
18-
<td title="'Mandatory'" sortable="'mandatory'" class="text-center">{{item.mandatory}}</td>
19-
<td title="'Optional'" sortable="'optional'" class="text-center">{{item.optional}}</td>
18+
<td title="'Mandatory'" sortable="'mandatoryName'" class="text-center">
19+
<ul>
20+
<li ng-repeat="subCourse in item.mandatoryName.split(',')">
21+
{{subCourse}}
22+
</li>
23+
</ul>
24+
</td>
25+
<td title="'Optional'" sortable="'optionalName'" class="text-center">
26+
<ul>
27+
<li ng-repeat="subCourse in item.optionalName.split(',')">
28+
{{subCourse}}
29+
</li>
30+
</ul>
31+
</td>
2032
<td title="'Operation'" class="text-center" >
2133
<span ng-if="!item.active" style="width: 80px;margin-left: 10px; margin-right: 10px;">Update</span>
2234
<a ng-click="updateGoldenSampleModal(item)" ng-if="item.active" style="width: 80px;margin-left: 10px; margin-right: 10px;">Update</a>

‎helloworld-springboot/src/main/java/com/cisco/la/controller/GoldenSampleController.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.springframework.web.bind.annotation.RequestMethod;
3535
import org.springframework.web.bind.annotation.RestController;
3636

37+
import com.cisco.la.entity.GoldenSampleJoin;
3738
import com.cisco.la.model.GoldenSampleModel;
3839
import com.cisco.la.service.GoldenSampleService;
3940

@@ -57,7 +58,7 @@ public Object getGoldenSample(HttpServletRequest request, @PathVariable("id") in
5758

5859
@RequestMapping(value = "list", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
5960
public Object getUserList(HttpServletRequest request){
60-
List<GoldenSampleModel> goldenSampleModelList = goldenSampleService.getGoldenSampleList();
61+
List<GoldenSampleJoin> goldenSampleModelList = goldenSampleService.getGoldenSampleList();
6162

6263
Map<String, Object> map = new HashMap<String, Object>();
6364
map.put("code", 1);
@@ -98,6 +99,7 @@ public Object updateUser(HttpServletRequest request, @RequestBody String json){
9899
try{
99100
JSONObject jsonObject = new JSONObject(json);
100101
GoldenSampleModel goldenSampleModel = new GoldenSampleModel();
102+
goldenSampleModel.setId(jsonObject.getInt("id"));
101103
goldenSampleModel.setGoldenSampleName(jsonObject.getString("goldenSampleName"));
102104
goldenSampleModel.setRoleID(jsonObject.getInt("roleID"));
103105
goldenSampleModel.setMandatory(jsonObject.getString("mandatory"));

0 commit comments

Comments
 (0)