Skip to content

Commit

Permalink
Start work on documents manipulation
Browse files Browse the repository at this point in the history 
TODO:
DOCUMENT MANIPULATION
DOCUMENT FILE MANIPULATION
TASK MANIPULATION
SHOW CONTEOLLED TASK FOR USER
SHOW USERS TASK
STOREHAUSE MANIPULATION
GOOD PRODUCTION AND SERVICE
  • Loading branch information
@FairWindCo
FairWindCo committed Oct 25, 2015
1 parent cc39835 commit 7cf5413
Show file tree
Hide file tree
Showing 10 changed files with 111 additions and 25 deletions.
26 changes: 25 additions & 1 deletion src/main/resources/label_en_US.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,28 @@ label.edit.persons.info_title=
label.field.name2=
label.button.loadrecord=
label.edit.persons.contactstable.contact_info.col_title=
label.edit.persons.title=
label.edit.persons.title=
label.organizational_elements=Organizational elements
label.nomenclaturetype.title=Nomenclature Types
label.storehouse=Storehouses
label.storehouse.view=List of storehouses
label.tasks=Tasks
label.tasks.task=Task Lists
label.tasks.activetask=Active Tasks
label.tasks.control=Create Task
label.tasks.controltask=Controlled Tasks
label.menu.globaldirectory.positions=Positions
label.menu.globaldirectory.documentstypes=Documents Type
label.menu.globaldirectory.tasktypes=Task Types
label.products=Products
label.products.view=Created products
label.products.repair=Products Repair
label.counterparts.title=Conterparts
label.name=Name
label.format=Format
label.globaldirectory.documenttype=Documents Types
label.globaldirectory.documenttype.title=Type of documents
label.description=Description
label.globaldirectory.tasktypes=Type of Tasks
label.globaldirectory.tasktypes.title=List of Type Tasks
label.globaldirectory.nomanklature_types=Nomenclature Types
24 changes: 24 additions & 0 deletions src/main/resources/label_ru_RU.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,3 +182,27 @@ label.documents.files.fileSize=Размер
label.documents.files.fileType=Тип файла
label.documents.files.filename=Имя файла
label.documents.files.title=Файлы документов
label.organizational_elements=Организационные элементы
label.nomenclaturetype.title=Тиипы номенклатуры
label.storehouse=Склады
label.storehouse.view=Список складов
label.tasks=Задачи
label.tasks.task=Список задач
label.tasks.activetask=Активные задачи
label.tasks.control=Задачи на контроле
label.tasks.controltask=Задачи на контроле
label.menu.globaldirectory.positions=Позиции
label.menu.globaldirectory.documentstypes=Типы документов
label.menu.globaldirectory.tasktypes=Типы задач
label.products=Продукты
label.products.view=Созданные продукты
label.products.repair=Продукты на ремонте
label.counterparts.title=Контрагент
label.name=Название
label.format=Формат
label.globaldirectory.documenttype=Типы документов
label.globaldirectory.documenttype.title=Список типов документов
label.description=Описание
label.globaldirectory.tasktypes=Типы документов
label.globaldirectory.tasktypes.title=Список типов документов
label.globaldirectory.nomanklature_types=Типы номенклатуры
26 changes: 25 additions & 1 deletion src/main/resources/label_ua_UA.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,4 +182,28 @@ label.documents.files.filename = Файл
label.documents.files.title = Файли документів
label.documents.files.creationDate=Дата створення
label.edit.persons.contactstable.contact_info.col_title=
label.edit.persons.passportInfo=
label.edit.persons.passportInfo=
label.organizational_elements=Організаційні елементи
label.nomenclaturetype.title=Типи номенклатури
label.storehouse=Склади
label.storehouse.view=Перелік складів
label.tasks=Завдання
label.tasks.task=Перелік завдань
label.tasks.activetask=Активні задання
label.tasks.control=Завдання на контролі
label.tasks.controltask=Завдання на контролі
label.menu.globaldirectory.positions=Позиції
label.menu.globaldirectory.documentstypes=Типи документів
label.menu.globaldirectory.tasktypes=Типи завдань
label.products=Продукти
label.products.view=Створені продкути
label.products.repair=Продукти на ремонті
label.counterparts.title=Партнери
label.name=Назва
label.format=Формат
label.globaldirectory.documenttype=Типи документів
label.globaldirectory.documenttype.title=Перелік типів документів
label.description=Опис
label.globaldirectory.tasktypes=Типи документів
label.globaldirectory.tasktypes.title=Перелік типів документів
label.globaldirectory.nomanklature_types=Типи номенклатури
29 changes: 22 additions & 7 deletions src/main/webapp/base_element/left_menu.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@
<a href="${pageContext.request.contextPath}/task/list"><c:message code="label.tasks.task"/></a>
</li>
<li>
<a href="${pageContext.request.contextPath}/task/active"><c:message code="label.tasks.task"/></a>
<a href="${pageContext.request.contextPath}/tasks/controlledTask"><c:message code="label.tasks.controltask"/></a>
</li>
<li>
<a href="${pageContext.request.contextPath}/task/active"><c:message code="label.tasks.activetask"/></a>
</li>
<sec:authorize ifAnyGranted="ROLE_TASK_CREATE">
<li>
Expand All @@ -85,6 +88,21 @@
</ul>
<!-- /.nav-second-level -->
</li>
<li>
<a href="#"><i class="fa fa-inbox fa-fw"></i><c:message code="label.organizational_elements"/><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li>
<a href="${pageContext.request.contextPath}/nomenclature/list/"><c:message code="label.nomenclature.title"/></a>
</li>
<li>
<a href="${pageContext.request.contextPath}/nomenclaturetypes/list/"><c:message code="label.nomenclaturetype.title"/></a>
</li>
<li>
<a href="${pageContext.request.contextPath}/counterparts/list/"><c:message code="label.counterparts.title"/></a>
</li>
</ul>
<!-- /.nav-second-level -->
</li>
<sec:authorize ifAnyGranted="ROLE_VIEW_DOCUMENTS, ROLE_EDIT_DOCUMENTS, ROLE_ADD_DOCUMENTS, ROLE_DELETE_DOCUMENTS">
<li>
<a href="#"><i class="fa fa-inbox fa-fw"></i><c:message code="label.documents"/><span class="fa arrow"></span></a>
Expand All @@ -109,9 +127,6 @@
<li>
<a href="${pageContext.request.contextPath}/roles/list"> <c:message code="label.administrate.roles"/></a>
</li>
<li>
<a href="subdivisions/"> <c:message code="label.administrate.subdivisions"/></a>
</li>
</ul>
</li>
</sec:authorize>
Expand All @@ -120,16 +135,16 @@
<a href=""><i class="fa fa-sitemap fa-fw"></i><c:message code="label.menu.globaldirectory"/><span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li>
<a href="${pageContext.request.contextPath}/tasktypes/list"> <c:message code="label.menu.globaldirectory.filetype"/></a>
<a href="${pageContext.request.contextPath}/tasktypes/list"> <c:message code="label.menu.globaldirectory.tasktypes"></c:message></a>
</li>
<li>
<a href="${pageContext.request.contextPath}/documenttypes/list"> <c:message code="label.menu.globaldirectory.activity"/></a>
<a href="${pageContext.request.contextPath}/documenttypes/list"> <c:message code="label.menu.globaldirectory.documentstypes"></c:message></a>
</li>
<li>
<a href="${pageContext.request.contextPath}/contacttypes/list"> <c:message code="label.menu.globaldirectory.contacttype"/></a>
</li>
<li>
<a href="${pageContext.request.contextPath}/positions/list"> <c:message code="label.menu.globaldirectory.hobbi"/></a>
<a href="${pageContext.request.contextPath}/positions/list"> <c:message code="label.menu.globaldirectory.positions"/></a>
</li>
</ul>
<!-- /.nav-second-level -->
Expand Down
11 changes: 5 additions & 6 deletions src/main/webapp/jsp/contact_type_list.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,15 @@
<div id="page-wrapper">
<ol class="breadcrumb">
<li><a href="${pageContext.request.contextPath}/"><c:message code="label.main"/></a></li>
<li><a href="#"><c:message code="label.globaldirectory"/></a></li>
<li class="active"><c:message code="label.globaldirectory.relativies"/></li>
<li class="active"><c:message code="label.menu.globaldirectory.contacttype"/></li>
</ol>
<div class="row">

<div class="col-lg-12">

<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><c:message code="label.globaldirectory.relativies.title"/></h3>
<h3 class="panel-title"><c:message code="label.globaldirectory.contacttypes.title"/></h3>
</div>
<div class="panel-body">
<div>
Expand All @@ -53,7 +52,7 @@
datatype: 'json',
mtype: 'POST',
styleUI : 'Bootstrap',
colNames:['Id', 'Name', 'Format', 'Version'],
colNames:['<c:message code="label.id"/>', '<c:message code="label.name"/>', '<c:message code="label.format"/>', '<c:message code="label.version"/>'],
colModel:[
{name:'id',index:'id', width:55, editable:false, editoptions:{readonly:true, size:10}, hidden:true},
{name:'name',index:'name', width:100, editable:true, editrules:{required:true}, editoptions:{size:10}},
Expand All @@ -69,8 +68,8 @@
sortname: 'id',
viewrecords: true,
sortorder: "asc",
caption:"Records",
emptyrecords: "Empty records",
caption:"<c:message code="label.globaldirectory.contacttypes.title"/>",
emptyrecords: "<c:message code="label.emptyrecords"/>",
loadonce: false,
loadComplete: function() {},
jsonReader : {
Expand Down
6 changes: 3 additions & 3 deletions src/main/webapp/jsp/document_type_list.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
datatype: 'json',
mtype: 'POST',
styleUI : 'Bootstrap',
colNames:['Id', 'Name', 'Format', 'Version'],
colNames:['<c:message code="label.id"/>', '<c:message code="label.name"/>', '<c:message code="label.format"/>', '<c:message code="label.version"/>'],
colModel:[
{name:'id',index:'id', width:55, editable:false, editoptions:{readonly:true, size:10}, hidden:true},
{name:'name',index:'name', width:100, editable:true, editrules:{required:true}, editoptions:{size:10}},
Expand All @@ -68,8 +68,8 @@
sortname: 'id',
viewrecords: true,
sortorder: "asc",
caption:"Records",
emptyrecords: "Empty records",
caption:"<c:message code="label.globaldirectory.documenttype.title"/>",
emptyrecords: "<c:message code="label.emptyrecords"/>",
loadonce: false,
altRows:true,
loadComplete: function() {},
Expand Down
6 changes: 3 additions & 3 deletions src/main/webapp/jsp/nomencla_type_list.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
datatype: 'json',
mtype: 'POST',
styleUI : 'Bootstrap',
colNames:['Id', 'Name', 'Version'],
colNames:['<c:message code="label.id"/>', '<c:message code="label.name"/>', '<c:message code="label.description"/>', '<c:message code="label.version"/>'],
colModel:[
{name:'id',index:'id', width:55, editable:false, editoptions:{readonly:true, size:10}, hidden:true},
{name:'name',index:'name', width:100, editable:true, editrules:{required:true}, editoptions:{size:10}},
Expand All @@ -68,8 +68,8 @@
sortname: 'id',
viewrecords: true,
sortorder: "asc",
caption:"<c:message code="label.globaldirectory.nuomanlature_types"/>",
emptyrecords: "Empty records",
caption:"<c:message code="label.globaldirectory.nomanklature_types"/>",
emptyrecords: "<c:message code="label.emptyrecords"/>",
loadonce: false,
loadComplete: function() {},
jsonReader : {
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/jsp/position_list.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
viewrecords: true,
sortorder: "asc",
caption:"Records",
emptyrecords: "Empty records",
emptyrecords: "<c:message code="label.emptyrecords"/>",
loadonce: false,
loadComplete: function() {},
jsonReader : {
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/jsp/role_list.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
viewrecords: true,
sortorder: "asc",
caption:"Records",
emptyrecords: "Empty records",
emptyrecords: "<c:message code="label.emptyrecords"/>",
loadonce: false,
loadComplete: function() {},
jsonReader : {
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/jsp/task_type_list.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
datatype: 'json',
mtype: 'POST',
styleUI : 'Bootstrap',
colNames:['Id', 'Name', 'Version'],
colNames:['<c:message code="label.id"/>', '<c:message code="label.name"/>', '<c:message code="label.version"/>'],
colModel:[
{name:'id',index:'id', width:55, editable:false, editoptions:{readonly:true, size:10}, hidden:true},
{name:'name',index:'name', width:100, editable:true, editrules:{required:true}, editoptions:{size:10}},
Expand All @@ -68,7 +68,7 @@
viewrecords: true,
sortorder: "asc",
caption:"Records",
emptyrecords: "Empty records",
emptyrecords: "<c:message code="label.emptyrecords"/>",
loadonce: false,
loadComplete: function() {},
jsonReader : {
Expand Down

0 comments on commit 7cf5413

Please sign in to comment.