v.2.12
-Add new setting "Delete shift" -Move "Shift" frontend to V1 module
This commit is contained in:
50
web/views/terminals/edit.html
Normal file
50
web/views/terminals/edit.html
Normal file
@@ -0,0 +1,50 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||
<h5 class="modal-title">Управление синхронизацией</h5>
|
||||
</div>
|
||||
<div class="modal-body p-lg">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-bordered">
|
||||
<thead>
|
||||
<th>Задача</th>
|
||||
<th>Период</th>
|
||||
<th style="width: 70px">Статус</th>
|
||||
<th style="width: 70px"><i class="material-icons"></i></th>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
<tr ng-repeat="task in active_tasks">
|
||||
<td>{{ task.name }} <span class="label primary m-r-xs left5">{{ task.code }}</span></td>
|
||||
<td><input type="number" class="form-control" ng-model="task.period" ng-change="changePeriod(task)" /></td>
|
||||
<td>
|
||||
<label class="ui-switch ui-switch-md m-t-xs">
|
||||
<input type="checkbox" checked="checked" ng-change="changeTask(task)" ng-model="task.active" />
|
||||
<i></i>
|
||||
</label>
|
||||
</td>
|
||||
<td>
|
||||
<button class="btn btn-sm white" ng-click="runTask(task)"><i class="material-icons"></i></button>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr ng-repeat="task in all_tasks" ng-if="isTaskActive(task)">
|
||||
<td>{{ task.name }} <span class="label primary m-r-xs left5">{{ task.code }}</span></td>
|
||||
<td><input type="number" class="form-control" ng-model="task.period" ng-change="changePeriod(task)" /></td>
|
||||
<td>
|
||||
<label class="ui-switch ui-switch-md m-t-xs">
|
||||
<input type="checkbox" ng-change="changeTask(task)" ng-model="task.active" />
|
||||
<i></i>
|
||||
</label>
|
||||
</td>
|
||||
<td>
|
||||
<button class="btn btn-sm white" ng-click="runTask(task)"><i class="material-icons"></i></button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
118
web/views/terminals/equipment.html
Normal file
118
web/views/terminals/equipment.html
Normal file
@@ -0,0 +1,118 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||
<h5 class="modal-title">Принтеры</h5>
|
||||
</div>
|
||||
<div class="modal-body p-lg">
|
||||
<div class="col-sm-12">
|
||||
<div class="b-b b-primary nav-active-primary">
|
||||
<ul class="nav nav-tabs">
|
||||
<li ng-repeat="printer in printers" class="nav-item">
|
||||
<a class="nav-link" href="" data-toggle="tab" data-target="#p{{printer.id}}" aria-expanded="false">Принтер: {{printer.name}}</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="tab-content p-a m-b-md">
|
||||
<div ng-repeat="printer in printers" class="tab-pane animated fadeIn text-muted" id="p{{printer.id}}" aria-expanded="false">
|
||||
<div class="form-horizontal">
|
||||
<div ng-if="objectHasProperty(printer, 'type')" class="form-group row">
|
||||
<label class="col-sm-3 form-control-label">Тип</label>
|
||||
<div class="col-sm-9">
|
||||
<select name="size" class="form-control input-c" ng-model="printer.type" ng-options="type for type in settings.types"></select>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-if="objectHasProperty(printer, 'ip') && printer.type == 'LAN'" class="form-group row">
|
||||
<label class="col-sm-3 form-control-label">IP</label>
|
||||
<div class="col-sm-9">
|
||||
<input ng-model="printer.ip" type="text" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-if="objectHasProperty(printer, 'port') && printer.type == 'LAN'" class="form-group row">
|
||||
<label class="col-sm-3 form-control-label">Порт</label>
|
||||
<div class="col-sm-9">
|
||||
<input ng-model="printer.port" type="number" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-if="objectHasProperty(printer, 'com_port') && printer.type == 'COM'" class="form-group row">
|
||||
<label for="" class="col-sm-3 form-control-label">COM Порт</label>
|
||||
<div class="col-sm-9">
|
||||
<select name="speed" class="form-control input-c" ng-model="printer.com_port" ng-options="com_port for com_port in settings.com_ports"></select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-sm-3 form-control-label">Бумага</label>
|
||||
<div class="col-sm-9">
|
||||
<select name="size" class="form-control input-c" ng-model="printer.size" ng-options="size for size in settings.sizes"></select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-if="objectHasProperty(printer, 'speed') && printer.type == 'COM'" class="form-group row">
|
||||
<label class="col-sm-3 form-control-label">Скорость</label>
|
||||
<div class="col-sm-9">
|
||||
<select name="speed" class="form-control input-c" ng-model="printer.speed" ng-options="speed for speed in settings.speeds"></select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-if="objectHasProperty(printer, 'codepage')" class="form-group row">
|
||||
<label for="" class="col-sm-3 form-control-label">Кодовая страница</label>
|
||||
<div class="col-sm-9">
|
||||
<select name="codepage" ng-model="printer.codepage" class="form-control input-c">
|
||||
<option value="EPSON">EPSON</option>
|
||||
<option value="WINCOR">WINCOR</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-sm-3 form-control-label">Группа</label>
|
||||
<div class="col-sm-9">
|
||||
<select name="codepage" ng-model="printer.printer_group" class="form-control input-c">
|
||||
<option ng-repeat="group in groups" value={{group.code}}>{{group.name}}</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-sm-3 form-control-label">Шаблон</label>
|
||||
<div class="col-sm-9">
|
||||
<select name="template" ng-model="printer.template" class="form-control input-c">
|
||||
<option value="Epson">Epson</option>
|
||||
<option value="Posbank">Posbank</option>
|
||||
<option value="Wincor">Wincor</option>
|
||||
<option value="Spark">Spark</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-if="objectHasProperty(printer, 'driver') && printer.type == 'Windows'" class="form-group row">
|
||||
<label class="col-sm-3 form-control-label">Драйвер</label>
|
||||
<div class="col-sm-9">
|
||||
<input ng-model="printer.driver" type="text" class="form-control">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label class="col-sm-3 form-control-label">Дополнительный текст</label>
|
||||
<div class="col-sm-9">
|
||||
<textarea class="form-control" ng-model="printer.more"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-12">
|
||||
<button class="btn btn-fw primary pull-right" ng-click="updateEquipment(printer)">Сохранить
|
||||
изменения
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
74
web/views/terminals/index.html
Normal file
74
web/views/terminals/index.html
Normal file
@@ -0,0 +1,74 @@
|
||||
<div id="container-floating">
|
||||
<div class="nd1 nds" data-toggle="tooltip" data-placement="left" title="Обновить" ng-click="update()" style="background-color: #d3a411"
|
||||
onmouseenter="$(this).tooltip('show')">
|
||||
<i class="material-icons"></i>
|
||||
</div>
|
||||
|
||||
<div id="floating-button" data-toggle="tooltip" data-placement="left" title="Действия" onmouseenter="$(this).tooltip('show')">
|
||||
<p class="plus">
|
||||
<i class="material-icons"></i>
|
||||
</p>
|
||||
<p class="edit">
|
||||
<i class="material-icons"></i>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="padding">
|
||||
<div class="box">
|
||||
<!-- <div class="table-responsive"> -->
|
||||
<table class="table table-striped m-a-0">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>Тип</th>
|
||||
<th>Код рабочей группы</th>
|
||||
<th>Код рабочего места</th>
|
||||
<th>Статус</th>
|
||||
<th>Последняя активность</th>
|
||||
<th style="width: 70px"><i class="material-icons"></i></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="terminal in terminals">
|
||||
<td><strong>{{ terminal.key }}</strong></td>
|
||||
<td><strong>{{ terminal.soft }}</strong></td>
|
||||
<td>{{ terminal.work_group }}</td>
|
||||
<td>{{ terminal.work_code }}</td>
|
||||
<td>
|
||||
<label class="ui-switch ui-switch-md m-t-xs">
|
||||
<input type="checkbox" ng-model="terminal.is_active" ng-change="onLicence(terminal.key, terminal.is_active)">
|
||||
<i></i>
|
||||
</label>
|
||||
</td>
|
||||
<td><span ng-if="terminal.last_activity != '0'">{{ terminal.last_activity }}</span></td>
|
||||
<td>
|
||||
<div class="dropdown inline">
|
||||
<button class="btn btn-sm white dropdown-toggle" data-toggle="dropdown">
|
||||
<i class="material-icons"></i>
|
||||
</button>
|
||||
<div class="dropdown-menu pull-right dropdown-menu-scale">
|
||||
<a class="dropdown-item" ng-click="editTerminal(terminal.key)">Управление синхронизацией</a>
|
||||
<a class="dropdown-item" ng-click="getEquipment(terminal.key)">Принтеры</a>
|
||||
<a class="dropdown-item" ng-click="showLogs(terminal.key)">Журнал</a>
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<!-- </div> -->
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="edit-terminal" data-backdrop="true">
|
||||
<div ui-include="'../views/terminals/edit.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="equipment" data-backdrop="true">
|
||||
<div ui-include="'../views/terminals/equipment.html'"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="logs" data-backdrop="true">
|
||||
<div ui-include="'../views/terminals/logs.html'"></div>
|
||||
</div>
|
||||
27
web/views/terminals/logs.html
Normal file
27
web/views/terminals/logs.html
Normal file
@@ -0,0 +1,27 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||
<h5 class="modal-title">Логи терминала</h5>
|
||||
</div>
|
||||
<div class="modal-body p-lg">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-bordered">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Log</th>
|
||||
<th>Time</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
<tr ng-repeat="log in terminalLogs">
|
||||
<td>{{log.value}}</td>
|
||||
<td>{{log.time}}</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
35
web/views/terminals/reports/delete.html
Normal file
35
web/views/terminals/reports/delete.html
Normal file
@@ -0,0 +1,35 @@
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||
<h5 class="modal-title">Отчет по удалениям</h5>
|
||||
</div>
|
||||
<div class="modal-body p-lg">
|
||||
<div class="table-responsive" ng-if="report_delete.length > 0">
|
||||
<table class="table table-bordered m-a-" ng-repeat="report in report_delete">
|
||||
<thead>
|
||||
<th>Заказ #{{ report.order_code }}</th>
|
||||
</thead>
|
||||
|
||||
<tbody>
|
||||
<tr ng-repeat="item in report.items">
|
||||
<td>
|
||||
<h6>{{ item.dish_name }} <small>(<strong>{{ item.count }}</strong> на сумму <strong>{{ item.sum }} BYN</strong>)</small></h6>
|
||||
|
||||
<p>
|
||||
Удалил: <strong>{{ item.who }}</strong><br/>
|
||||
Подтвердил: <strong>{{ item.approved }}</strong><br/>
|
||||
Причина: <strong>{{ item.reason }}</strong>
|
||||
</p>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div ng-if="report_delete.length == 0">
|
||||
<p>Удаления отсутствуют</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
Reference in New Issue
Block a user