Добавлен расширенный отчет по реализации
Добавлен монитор активности
This commit is contained in:
miroman-afk
2023-08-03 11:05:15 +03:00
parent 19ad7d1c8a
commit c4dc6e02a0
93 changed files with 13328 additions and 1122 deletions

View File

@@ -1,19 +1,3 @@
<div id="container-floating">
<div class="nd1 nds" data-toggle="tooltip" data-placement="left" title="Обновить" ng-click="updateData()" style="background-color: #d3a411"
onmouseenter="$(this).tooltip('show')">
<i class="material-icons">&#xE5D5;</i>
</div>
<div id="floating-button" data-toggle="tooltip" data-placement="left" title="Действия" onmouseenter="$(this).tooltip('show')">
<p class="plus">
<i class="material-icons">&#xE5D2;</i>
</p>
<p class="edit">
<i class="material-icons">&#xE5CD;</i>
</p>
</div>
</div>
<div class="padding">
<div class="margin">
<div class="row">
@@ -72,13 +56,13 @@
<h4 class="m-a-0 text-md">
<a>{{total | curr}}</a>
</h4>
<small class="text-muted">выручка</small>
<small class="text-muted">заказы</small>
</div>
<div class="box-tool">
<ul class="nav">
<li class="nav-item">
<a ng-click="getMore('total')">
<a sglclick="getMoreTotal('total')">
<i class="fa fa-eye"></i>
</a>
</li>
@@ -124,7 +108,7 @@
<div class="col-sm-6 col-md-4 one-height">
<div class="box">
<div class="box-header danger">
<h3>Удаления: {{deleted}}</h3>
<h3>Удалено товаров: {{orders_deleted.total}}</h3>
</div>
<div class="box-tool box-tool-white">
@@ -138,12 +122,12 @@
</div>
<div class="box-body b-t">
<h4 class="m-a-0 text-md" ng-if="deleted > 0">
<h4 class="m-a-0 text-md" ng-if="orders_deleted.total > 0">
<a>
<span class="text-sm lead"><strong>Сумма: {{deleted_sum | curr}} BYN</strong></span>
<span class="text-sm lead"><strong>Сумма: {{orders_deleted.sum | curr}} BYN</strong></span>
</a>
</h4>
<span class="text-muted" ng-if="deleted == 0">Удаленных позиций нет</span>
<span class="text-muted" ng-if="orders_deleted.total == 0">Удаленных товаров нет</span>
</div>
</div>
</div>
@@ -169,7 +153,7 @@
<div class="box-body b-t">
<h4 class="m-a-0 text-md" ng-if="discounts > 0">
<a>
<span class="text-sm lead"><strong>Сумма: {{tot_disc_sum | curr}} BYN</strong></span>
<span class="text-sm lead"><strong>Сумма: {{tot_disc_sum | curr}} BYN <small>(Сумма скидок: {{discounts_sum | curr}} BYN)</small></strong></span>
</a>
</h4>
<span class="text-muted" ng-if="discounts == 0">Заказов со скидками нет</span>
@@ -181,14 +165,14 @@
<div class="box">
<div class="box-header blue">
<h3>
Гостей: {{guests}}
Именованных гостей: {{namedGuests}}
</h3>
</div>
<div class="box-tool box-tool-white">
<ul class="nav">
<li class="nav-item">
<a ng-click="getMoreGuests()">
<a sglclick="getMoreGuests('guests')">
<i class="fa fa-eye"></i>
</a>
</li>
@@ -275,6 +259,34 @@
</small>
</div>
</div>
<div class="row-cell p-a">
<div class="inline m-b">
<div ui-jp="easyPieChart" class="easyPieChart" ui-refresh="app.setting.color" data-redraw='true' data-percent="{{ orders_cancellations.percent }}"
ui-options="{
lineWidth: 8,
trackColor: 'rgba(0,0,0,0.05)',
barColor: '{{ app.setting.color.primary }}',
scaleColor: 'transparent',
size: 100,
scaleLength: 0,
animate:{
duration: 1500,
enabled:true
}
}">
<div>
<h5>{{ orders_cancellations.percent }}%</h5>
</div>
</div>
</div>
<div>
Аннулированные
<small class="block m-b">
<strong>{{ orders_cancellations.total }}</strong> на сумму
<strong>{{ orders_cancellations.sum | curr}}</strong>
</small>
</div>
</div>
</div>
</div>
</div>
@@ -283,7 +295,7 @@
<div class="col-md-6 col-xl-4">
<div class="box">
<div class="box-header">
<h3>Текущие заказы</h3>
<h3>Информация о товарах</h3>
</div>
<div class="text-center b-t" style="height: 230px">
@@ -337,7 +349,7 @@
</div>
</div>
<div>
Возвраты
Возвращенные
<small class="block m-b">
<strong>{{ orders_returned.total }}</strong> на сумму
<strong>{{ orders_returned.sum | curr}}</strong>
@@ -375,7 +387,7 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="personal in personals" ng-click="getStaffMore(personal)">
<tr ng-repeat="personal in personals" ng-click="getMoreStaff(personal, 'guests')" ng-if="personal.orders_count > 0">
<td class="text-left">
<strong>{{ personal.name }}</strong>
</td>
@@ -505,8 +517,8 @@
<td>
<strong>{{ table.table_name }}</strong>
</td>
<td>{{ table.guests_count }}</td>
<td class="text-right">{{ table.sum | curr}}</td>
<td>{{ table.orders_count }}</td>
<td class="text-right">{{ table.orders_sum | curr}}</td>
</tr>
</tbody>
</table>
@@ -565,54 +577,22 @@
<div ui-include="'../views/dashboard/add.html'"></div>
</div>
<div class="modal fade" id="get-more-deleted">
<div ui-include="'../views/dashboard/items/more-deleted.html'"></div>
</div>
<!--<div class="modal my-modal fade" id="get-more-newyear">
<div ui-include="'../views/dashboard/items/more-newyear.html'"></div>
</div>-->
<div class="modal fade" id="get-more-guests">
<div ui-include="'../views/dashboard/items/more-guests.html'"></div>
<div class="modal fade" id="order">
<div ui-include="'../views/activitymonitor/items/order.html'"></div>
</div>
<div class="modal fade" id="get-more-discount">
<div ui-include="'../views/dashboard/items/more-discount.html'"></div>
</div>
<div class="modal fade" id="get-more-total">
<div ui-include="'../views/dashboard/items/more-total.html'"></div>
</div>
<div class="modal fade" id="get-more-staff">
<div ui-include="'../views/dashboard/items/more-staff.html'"></div>
<div class="modal fade" id="orders">
<div ui-include="'../views/activitymonitor/items/orders.html'"></div>
</div>
<div class="modal fade" id="get-more-table">
<div ui-include="'../views/dashboard/items/more-table.html'"></div>
</div>
<div class="modal fade" id="items-guests">
<div ui-include="'../views/dashboard/items/items-guests.html'"></div>
</div>
<div class="modal fade" id="items-discount">
<div ui-include="'../views/dashboard/items/items-discount.html'"></div>
</div>
<div class="modal fade" id="items-total">
<div ui-include="'../views/dashboard/items/items-total.html'"></div>
</div>
<div class="modal fade" id="items-staff">
<div ui-include="'../views/dashboard/items/items-staff.html'"></div>
</div>
<div class="modal fade" id="items-deleted">
<div ui-include="'../views/dashboard/items/items-deleted.html'"></div>
</div>
<div class="modal fade" id="preload-modal" data-backdrop="true">
<div ui-include="'../views/dashboard/preload.html'"></div>
</div>