v.2.30
Small fix
This commit is contained in:
miroman-afk
5
web/views/jointjs/index.html
Normal file
5
web/views/jointjs/index.html
Normal file
@@ -0,0 +1,5 @@
|
||||
<div id="tables" class="box" style="width: 95vw;
|
||||
height: 80vh;
|
||||
margin: 1.5rem;">
|
||||
<div id="paper-container"></div>
|
||||
</div>
|
||||
35
web/views/jointjs/items/create-place.html
Normal file
35
web/views/jointjs/items/create-place.html
Normal file
@@ -0,0 +1,35 @@
|
||||
<div class="modal-dialog" id="animate" ui-class="fade-down-big">
|
||||
<div class="modal-content">
|
||||
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">Создание зала</h5>
|
||||
</div>
|
||||
<div class="modal-body text-center p-lg">
|
||||
<div class="box">
|
||||
<div class="box-divider m-0"></div>
|
||||
<div class="box-body">
|
||||
<form role="form">
|
||||
<div class="form-group row">
|
||||
<label for="inputName" class="col-sm-2 form-control-label">Имя</label>
|
||||
<div class="col-sm-10">
|
||||
<input type="text" class="form-control" id="inputName"
|
||||
ng-model="placeName"
|
||||
placeholder="{{placeName}}"/>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn dark-white p-x-md" data-dismiss="modal">Отмена</button>
|
||||
<button type="button" class="btn danger p-x-md" data-dismiss="modal"
|
||||
ng-click="savePlace(placeName)">Сохранить
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</div><!-- /.modal-content -->
|
||||
</div>
|
||||
|
||||
|
||||
<script type="text/javascript" src="/libs/js/moment/locale/ru.js"></script>
|
||||
51
web/views/jointjs/items/create-table.html
Normal file
51
web/views/jointjs/items/create-table.html
Normal file
@@ -0,0 +1,51 @@
|
||||
<div class="modal-dialog" id="animate" ui-class="fade-down-big">
|
||||
<div class="modal-content">
|
||||
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">Добавление стола</h5>
|
||||
</div>
|
||||
<div class="modal-body text-center p-lg">
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<small>Высота и ширина стола должны быть не меньше 80px.</small>
|
||||
</div>
|
||||
<div class="box-divider m-0"></div>
|
||||
<div class="box-body">
|
||||
<form role="form">
|
||||
<div class="form-group row">
|
||||
<label for="inputName" class="col-sm-2 form-control-label">Имя</label>
|
||||
<div class="col-sm-10">
|
||||
<input type="text" class="form-control"
|
||||
ng-model="editPlaceTableId"
|
||||
placeholder="{{editPlaceTableId}}" hidden/>
|
||||
<input type="text" class="form-control" id="inputName"
|
||||
ng-model="tableName"
|
||||
placeholder="{{tableName}}"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="inputType" class="col-sm-2 form-control-label">Вид стола</label>
|
||||
<div class="col-sm-10">
|
||||
<select id="inputType" class="form-control c-select" ng-model="tableType">
|
||||
<option value="0">Прямоугольный</option>
|
||||
<option value="1">Круглый</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn dark-white p-x-md" data-dismiss="modal">Отмена</button>
|
||||
<button type="button" class="btn danger p-x-md" data-dismiss="modal"
|
||||
ng-click="saveNewTable(editPlaceTableId, tableName, tableType)">Сохранить
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</div><!-- /.modal-content -->
|
||||
</div>
|
||||
|
||||
|
||||
<script type="text/javascript" src="/libs/js/moment/locale/ru.js"></script>
|
||||
38
web/views/jointjs/items/edit-place.html
Normal file
38
web/views/jointjs/items/edit-place.html
Normal file
@@ -0,0 +1,38 @@
|
||||
<div class="modal-dialog" id="animate" ui-class="fade-down-big">
|
||||
<div class="modal-content">
|
||||
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">Редактирование зала</h5>
|
||||
</div>
|
||||
<div class="modal-body text-center p-lg">
|
||||
<div class="box">
|
||||
<div class="box-divider m-0"></div>
|
||||
<div class="box-body">
|
||||
<form role="form">
|
||||
<div class="form-group row">
|
||||
<label for="inputName" class="col-sm-2 form-control-label">Имя</label>
|
||||
<div class="col-sm-10">
|
||||
<input type="text" class="form-control" id="inputId"
|
||||
ng-model="editPlaceId"
|
||||
placeholder="{{editPlaceId}}" hidden/>
|
||||
<input type="text" class="form-control" id="inputName"
|
||||
ng-model="editPlaceName"
|
||||
placeholder="{{editPlaceName}}"/>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn dark-white p-x-md" data-dismiss="modal">Отмена</button>
|
||||
<button type="button" class="btn danger p-x-md" data-dismiss="modal"
|
||||
ng-click="updatePlace(editPlaceId,editPlaceName)">Сохранить
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</div><!-- /.modal-content -->
|
||||
</div>
|
||||
|
||||
|
||||
<script type="text/javascript" src="/libs/js/moment/locale/ru.js"></script>
|
||||
70
web/views/jointjs/items/edit-table.html
Normal file
70
web/views/jointjs/items/edit-table.html
Normal file
@@ -0,0 +1,70 @@
|
||||
<div class="modal-dialog" id="animate" ui-class="fade-down-big">
|
||||
<div class="modal-content">
|
||||
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title">Редактирование стола</h5>
|
||||
</div>
|
||||
<div class="modal-body text-center p-lg">
|
||||
<div class="box">
|
||||
<div class="box-header">
|
||||
<small>Номер стола должен отличаться от существующих.</small>
|
||||
<small>Высота и ширина стола должны быть не меньше 80px.</small>
|
||||
</div>
|
||||
<div class="box-divider m-0"></div>
|
||||
<div class="box-body">
|
||||
<form role="form">
|
||||
<div class="form-group row">
|
||||
<label for="inputNumber" class="col-sm-2 form-control-label">Номер</label>
|
||||
<div class="col-sm-10">
|
||||
<input type="text" class="form-control" id="inputNumber" placeholder="{{tableId}}"
|
||||
ng-model="tableId"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="inputName" class="col-sm-2 form-control-label">Имя</label>
|
||||
<div class="col-sm-10">
|
||||
<input type="text" class="form-control" id="inputName"
|
||||
ng-model="tableName"
|
||||
placeholder="{{tableName}}"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="inputWidth" class="col-sm-2 form-control-label">Ширина</label>
|
||||
<div class="col-sm-10">
|
||||
<input type="text" class="form-control" id="inputWidth" placeholder="{{tableWidth}}"
|
||||
ng-model="tableWidth"/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group row">
|
||||
<label for="inputHeight" class="col-sm-2 form-control-label">Высота</label>
|
||||
<div class="col-sm-10">
|
||||
<input type="text" class="form-control" id="inputHeight" placeholder="{{tableHeight}}"
|
||||
ng-model="tableHeight"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group row">
|
||||
<label for="inputType" class="col-sm-2 form-control-label">Вид стола</label>
|
||||
<div class="col-sm-10">
|
||||
<select id="inputType" class="form-control c-select" ng-model="tableType">
|
||||
<option value="0">Прямоугольный</option>
|
||||
<option value="1">Круглый</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn dark-white p-x-md" data-dismiss="modal">Отмена</button>
|
||||
<button type="button" class="btn danger p-x-md" data-dismiss="modal"
|
||||
ng-click="saveTable(tableIndex, tableId, tableName, tableWidth, tableHeight, tableType)">Сохранить
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</div><!-- /.modal-content -->
|
||||
</div>
|
||||
|
||||
|
||||
<script type="text/javascript" src="/libs/js/moment/locale/ru.js"></script>
|
||||
@@ -35,7 +35,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="padding" id="places">
|
||||
<div class="padding" id="places" style="width: 100vw;">
|
||||
<div class="box">
|
||||
<div class="padding">
|
||||
<h4>Список залов
|
||||
@@ -50,7 +50,7 @@
|
||||
|
||||
<hr/>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-bordered m-a-0">
|
||||
<table class="table table-responsive table-bordered m-a-0">
|
||||
<thead>
|
||||
<th ng-repeat="place in roommap">
|
||||
<button type="button" class="btn info btn-block" sglclick="getTables(place.place_id)"
|
||||
@@ -78,7 +78,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="padding" id="background_1" ng-style="{'max-width':(maxWidth) + 'px', 'width':(screenWidth) + 'vw'}">
|
||||
<div class="padding" id="background_1" ng-style="{'width':(100) + 'vw'}"><!--'max-width':(maxWidth) + 'px', -->
|
||||
<div class="box">
|
||||
<div class="padding" id="background">
|
||||
<!--<div id="tables" class="box" ng-style="{'height':(windowHeight) + 'px'}">-->
|
||||
@@ -96,18 +96,16 @@
|
||||
</div>
|
||||
<div ng-repeat="table in tables" ng-model="tables" context-menu>
|
||||
|
||||
<div ng-if="table.type == 0" id="{{ 'table_' + $index }}" class="demo-div" draggable resize
|
||||
<button ng-if="table.type == 0" id="{{ 'table_' + $index }}" class="demo-div md-btn white" draggable resize
|
||||
context-menu
|
||||
data-target="table-{{ $index }}"
|
||||
ng-mouseup="getCoords($event, $index, table.table_id, table.place_id)"
|
||||
ng-style="{'width':'' + table.width * percentWidth + 'px', 'height':'' + table.height * percentHeight + 'px', 'top':'calc(' + top + 'px + ' + table.x * percentHeight + 'px)', 'left': 'calc(' + left + 'px + ' + table.y * percentWidth + 'px)'}"
|
||||
style="position: fixed;cursor: default;font-family: sans-serif;text-align: center;background-color: #FFFFFF;border: 2px solid #2196f3; z-index: 1; border-radius: 5%">
|
||||
<div class="box-header">
|
||||
<small>{{table.name}}</small>
|
||||
<small>{{table.table_id}}</small>
|
||||
</div>
|
||||
<small style="font-size: 70%">{{table.name}}</small>
|
||||
<small style="font-size: 70%">{{table.table_id}}</small>
|
||||
|
||||
</div>
|
||||
</button>
|
||||
|
||||
<div ng-if="table.type == 1" id="{{ 'table_' + $index }}" class="demo-div" draggable resize
|
||||
context-menu
|
||||
@@ -119,8 +117,8 @@
|
||||
ng-style="{'width':'' + table.width * percentWidth + 'px', 'height':'' + table.height * percentHeight + 'px'}"
|
||||
style="background: transparent; box-shadow: 0 0px 0px transparent;">
|
||||
<div class="box-header">
|
||||
<small>{{table.name}}</small>
|
||||
<small>{{table.table_id}}</small>
|
||||
<small style="font-size: 70%">{{table.name}}</small>
|
||||
<small style="font-size: 70%">{{table.table_id}}</small>
|
||||
</div>
|
||||
<div class="box-footer"></div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user