Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update #16

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f90890f
Merge pull request #6 from DariaSSemikina/master
KarachunVladislav01 May 9, 2016
feb8ac0
Update
KarachunVladislav01 May 9, 2016
a15ea40
Merge pull request #7 from DariaSSemikina/master
KarachunVladislav01 May 9, 2016
df4476e
Обновление
KarachunVladislav01 May 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions RESTfulAPIKorpPortal/src/main/java/by/bsuir/ief/rest/controller/TaskController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,10 @@ public Task createTask(@RequestBody Task task)

@RequestMapping(value = "/add-task-by-person/{idPerson}", method = RequestMethod.POST)
@ResponseStatus(HttpStatus.OK)
public Task createTaskByPerson(@RequestBody Task task)
public Task createTaskByPerson(@RequestBody Task task, @PathVariable("idPerson") int idPerson)
{
try {
task = service.add(task);
task = service.addTaskByPerson(task,idPerson);
} catch (BadAddEntityException e) {
throw new BadExceptionRest(e.toString());
}
Expand Down
2 changes: 1 addition & 1 deletion RESTfulAPIKorpPortal/src/main/java/by/bsuir/ief/rest/model/entity/Department.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public Department() {

@Id
@Column(name = "id_department", nullable = false)
@GeneratedValue(strategy = GenerationType.TABLE)
@GeneratedValue(strategy = GenerationType.IDENTITY)
public Integer getIdDepartment() {
return idDepartment;
}
Expand Down
1 change: 1 addition & 0 deletions RESTfulAPIKorpPortal/src/main/java/by/bsuir/ief/rest/model/service/TaskService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public Task addTaskByPerson(Task task, int idPerson) throws BadAddEntityExceptio
task = taskHibernate.create(task);
flag = daoMySql.createHasTaskPerson(task.getId_task(),idPerson);
} catch (Exception e) {
e.printStackTrace();
throw new BadAddEntityException(Task.class.toString(),e);
}
return task;
Expand Down
82 changes: 0 additions & 82 deletions RESTfulAPIKorpPortal/src/test/java/by/bsuir/ief/rest/controller/UserControllerTest.java
View file
Open in desktop

This file was deleted.

90 changes: 0 additions & 90 deletions RESTfulAPIKorpPortal/src/test/java/by/bsuir/ief/rest/dao/DBCalendarTest.java
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ...rativPortal/src/main/java/by/bsuir/ief/corporativ_portal/controller/PersonController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,4 @@ public ModelAndView showDetails(@PathVariable("id")int idPerson, ModelMap modelM
return new ModelAndView(ClientURL.getProperty("url.showAllPerson"),modelMap);
}








}
2 changes: 1 addition & 1 deletion WebCorporativPortal/src/main/webapp/WEB-INF/views/pages/listTasks.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
</td>
<td>${cell.date_begin}</td>
<td>${cell.date_end}</td>
<td>${cell.current}</td>
<td><input type="checkbox" <c:if test="${cell.current}">checked</c:if>/></td>
<td>${cell.type_pask.nameTypeTask}</td>
<td>${cell.type_pask.complication}</td>
<td class="project_progress">
Expand Down
4 changes: 2 additions & 2 deletions WebCorporativPortal/src/main/webapp/WEB-INF/views/pages/newsList.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<div class="">
<div class="page-title">
<div class="title_left">
<h3>Контакты <small>Сотрудники компании</small></h3>
<h3>Новости <small>Новостная лента</small></h3>
</div>
</div>

Expand All @@ -29,7 +29,7 @@
<div class="col-md-12">
<div class="x_panel">
<div class="x_title">
<h2>Контакты</h2>
<h2>Новости</h2>
<div class="clearfix"></div>
</div>
<div class="x_content">
Expand Down
15 changes: 0 additions & 15 deletions WebCorporativPortal/src/main/webapp/WEB-INF/views/pages/rating.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,21 +71,6 @@
<div class="x_panel tile fixed_height_320 overflow_hidden">
<div class="x_title">
<h2>Круговая диаграмма</h2>
<ul class="nav navbar-right panel_toolbox">
<li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"><i class="fa fa-wrench"></i></a>
<ul class="dropdown-menu" role="menu">
<li><a href="#">Settings 1</a>
</li>
<li><a href="#">Settings 2</a>
</li>
</ul>
</li>
<li><a class="close-link"><i class="fa fa-close"></i></a>
</li>
</ul>
<div class="clearfix"></div>
</div>
<div class="x_content">
Expand Down