Переглянути джерело

Amélioration du bloc "Production" dans le backend

Mise en valeur du nombre de commandes à travers un label dans le head du panel.
Mise en avant du bouton permettant l'export des commandes
prodstable
keun 8 роки тому
джерело
коміт
68b13a196e
4 змінених файлів з 88 додано та 52 видалено
  1. +13
    -11
      backend/views/commande/index.php
  2. BIN
      backend/web/.sass-cache/c8fef7d48da4dc7f024edc2b0fada9d8d6de5dac/screen.scssc
  3. +56
    -41
      backend/web/css/screen.css
  4. +19
    -0
      backend/web/sass/screen.scss

+ 13
- 11
backend/views/commande/index.php Переглянути файл

@@ -35,12 +35,21 @@ foreach ($produits as $p) {
</div>
<?php if ($date != ''): ?>
<div class="col-md-5">
<div class="col-md-5" id="bloc-production">
<div class="panel panel-default">
<div class="panel-heading">
<?php if (!count($commandes)): ?><span class="label label-danger">Aucune commande</span>
<?php else: ?><span class="label label-success"><?= count($commandes) ?> commande<?php if(count($commandes) > 1): ?>s<?php endif; ?></span>
<?php endif; ?>
<h3 class="panel-title">Production du <strong><?php echo date('d/m/Y', strtotime($date)); ?></strong></h3>
</div>
<div class="panel-body">
<?php if (count($commandes)): ?>
<a id="btn-export-commandes" class="btn btn-primary" href="<?php echo Yii::$app->urlManager->createUrl(['commande/report', 'date' => $date, 'id_point_vente' => 0, 'global' => 1]); ?>"><span class="glyphicon glyphicon-download-alt"></span> Exporter les commandes</a>
<?php endif; ?>
<strong>Production</strong><br />
<div class="btn-group" role="group">
<a class="btn btn-default<?php if ($production->actif): ?> btn-success<?php endif; ?>" href="<?php echo Yii::$app->urlManager->createUrl(['commande/change-state', 'date' => $date, 'actif' => 1]); ?>">Activé</a>
@@ -48,20 +57,13 @@ foreach ($produits as $p) {
</div>
<br />
<br />
<strong>Livraison</strong> <br />
<?php if ($production->actif): ?>
<strong>Livraison</strong><br />
<div class="btn-group" role="group">
<a class="btn btn-default<?php if ($production->livraison): ?> btn-success<?php endif; ?>" href="<?php echo Yii::$app->urlManager->createUrl(['commande/change-livraison', 'date' => $date, 'livraison' => 1]); ?>">Activé</a>
<a class="btn btn-default<?php if (!$production->livraison): ?> btn-danger<?php endif; ?>" href="<?php echo Yii::$app->urlManager->createUrl(['commande/change-livraison', 'date' => $date, 'livraison' => 0]); ?>">Désactivé</a>
</div>
<br /><br />

<?php if (!count($commandes)): ?>
<div class="alert alert-info">Aucune commande passée pour cette date</div>
<?php else: ?>
<strong><?= count($commandes) ?> commande<?php if(count($commandes)> 1): ?>s<?php endif; ?></strong><br />
<a class="btn btn-primary" href="<?php echo Yii::$app->urlManager->createUrl(['commande/report', 'date' => $date, 'id_point_vente' => 0, 'global' => 1]); ?>"><span class="glyphicon glyphicon-download-alt"></span> Récapitulatif global</a>
<br />
<br />
<?php endif; ?>
</div>
</div>

BIN
backend/web/.sass-cache/c8fef7d48da4dc7f024edc2b0fada9d8d6de5dac/screen.scssc Переглянути файл


+ 56
- 41
backend/web/css/screen.css Переглянути файл

@@ -216,74 +216,89 @@ a:hover, a:focus, a:active {
float: none;
padding-top: 2px;
}
/* line 223, ../sass/screen.scss */
/* line 219, ../sass/screen.scss */
#page-commande #bloc-production .label {
float: right;
font-size: 13px;
}
/* line 224, ../sass/screen.scss */
#page-commande #bloc-production .btn-success {
background-color: #5cb85c;
border-color: #4cae4c;
}
/* line 229, ../sass/screen.scss */
#page-commande #bloc-production #btn-export-commandes {
float: right;
margin-top: 20px;
}
/* line 242, ../sass/screen.scss */
#page-commande #produits-production .overflow table {
width: 100%;
}
/* line 227, ../sass/screen.scss */
/* line 246, ../sass/screen.scss */
#page-commande #produits-production .overflow thead, #page-commande #produits-production .overflow tbody, #page-commande #produits-production .overflow tr, #page-commande #produits-production .overflow td, #page-commande #produits-production .overflow th {
display: block;
}
/* line 229, ../sass/screen.scss */
/* line 248, ../sass/screen.scss */
#page-commande #produits-production .overflow tr:after {
content: ' ';
display: block;
visibility: hidden;
clear: both;
}
/* line 236, ../sass/screen.scss */
/* line 255, ../sass/screen.scss */
#page-commande #produits-production .overflow thead th {
height: 30px;
/*text-align: left;*/
}
/* line 242, ../sass/screen.scss */
/* line 261, ../sass/screen.scss */
#page-commande #produits-production .overflow tbody {
height: 200px;
overflow-y: auto;
}
/* line 250, ../sass/screen.scss */
/* line 269, ../sass/screen.scss */
#page-commande #produits-production .overflow thead th {
width: 32%;
float: left;
}
/* line 255, ../sass/screen.scss */
/* line 274, ../sass/screen.scss */
#page-commande #produits-production .overflow tbody td {
width: 33%;
float: left;
}
/* line 260, ../sass/screen.scss */
/* line 279, ../sass/screen.scss */
#page-commande #produits-production .overflow .td-produit {
width: 60%;
}
/* line 263, ../sass/screen.scss */
/* line 282, ../sass/screen.scss */
#page-commande #produits-production .overflow .td-actif, #page-commande #produits-production .overflow .td-max {
width: 20%;
text-align: center;
}
/* line 269, ../sass/screen.scss */
/* line 288, ../sass/screen.scss */
#page-commande #produits-production .overflow thead .td-produit {
width: 57%;
}
/* line 275, ../sass/screen.scss */
/* line 294, ../sass/screen.scss */
#page-commande #produits-production input.quantite-max {
background-color: white;
border: 1px solid #e0e0e0;
text-align: center;
width: 50px;
}
/* line 283, ../sass/screen.scss */
/* line 302, ../sass/screen.scss */
#page-commande #produits-production td label {
font-weight: normal;
}
/* line 289, ../sass/screen.scss */
/* line 308, ../sass/screen.scss */
#page-commande .form-commandes-point-vente {
margin-top: 20px;
}
/* line 293, ../sass/screen.scss */
/* line 312, ../sass/screen.scss */
#page-commande .form-commandes-point-vente table {
border-bottom: solid 1px #e0e0e0;
}
/* line 297, ../sass/screen.scss */
/* line 316, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .title-point-vente {
background-color: #fff8e2;
border-left: solid 3px #BB8757;
@@ -291,76 +306,76 @@ a:hover, a:focus, a:active {
text-align: left;
padding: 10px;
}
/* line 305, ../sass/screen.scss */
/* line 324, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .title-totaux {
text-align: center;
}
/* line 309, ../sass/screen.scss */
/* line 328, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .border-left {
border-left: solid 1px #e0e0e0;
}
/* line 313, ../sass/screen.scss */
/* line 332, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .border-right {
border-right: solid 1px #e0e0e0;
}
/* line 317, ../sass/screen.scss */
/* line 336, ../sass/screen.scss */
#page-commande .form-commandes-point-vente input.quantite {
width: 30px;
background-color: white;
border: solid 1px #e0e0e0;
text-align: center;
}
/* line 325, ../sass/screen.scss */
/* line 344, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .td-produit {
text-align: center;
}
/* line 329, ../sass/screen.scss */
/* line 348, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .submit-pv {
float: right;
}
/* line 333, ../sass/screen.scss */
/* line 352, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .select-user {
background-color: #F9F9F9;
border: solid 1px #e0e0e0;
}
/* line 338, ../sass/screen.scss */
/* line 357, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .date-commande {
font-size: 12px;
}
/* line 342, ../sass/screen.scss */
/* line 361, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .datepicker, #page-commande .form-commandes-point-vente .text {
background-color: white;
border: solid 1px #e0e0e0;
margin-top: 3px;
width: 100px;
}
/* line 350, ../sass/screen.scss */
/* line 369, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.center {
text-align: center;
}
/* line 356, ../sass/screen.scss */
/* line 375, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .depasse {
color: #b32815;
}
/* line 360, ../sass/screen.scss */
/* line 379, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .total strong span {
font-weight: normal;
font-size: 13px;
}
/* line 365, ../sass/screen.scss */
/* line 384, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .vrac {
display: none;
}
/* line 369, ../sass/screen.scss */
/* line 388, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.client {
text-align: left;
padding: 3px;
}
/* line 372, ../sass/screen.scss */
/* line 391, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.client .date-commande {
color: gray;
}
/* line 383, ../sass/screen.scss */
/* line 402, ../sass/screen.scss */
#page-commande .table-header-rotated td {
width: 20px;
padding: 0px;
@@ -370,7 +385,7 @@ a:hover, a:focus, a:active {
vertical-align: middle;
text-align: center;
}
/* line 393, ../sass/screen.scss */
/* line 412, ../sass/screen.scss */
#page-commande .table-header-rotated th.rotate-45 {
height: 80px;
width: 20px;
@@ -382,7 +397,7 @@ a:hover, a:focus, a:active {
font-size: 12px;
line-height: 0.8;
}
/* line 405, ../sass/screen.scss */
/* line 424, ../sass/screen.scss */
#page-commande .table-header-rotated th.rotate-45 > div {
position: relative;
top: 0px;
@@ -399,7 +414,7 @@ a:hover, a:focus, a:active {
border-right: 1px solid #dddddd;
border-top: 1px solid #dddddd;
}
/* line 421, ../sass/screen.scss */
/* line 440, ../sass/screen.scss */
#page-commande .table-header-rotated th.rotate-45 span {
-ms-transform: skew(45deg, 0deg) rotate(315deg);
-moz-transform: skew(45deg, 0deg) rotate(315deg);
@@ -422,35 +437,35 @@ a:hover, a:focus, a:active {
/*whether to display in one line or not*/
}

/* line 446, ../sass/screen.scss */
/* line 465, ../sass/screen.scss */
#email-masse-form #ids-users {
line-height: 30px;
}
/* line 448, ../sass/screen.scss */
/* line 467, ../sass/screen.scss */
#email-masse-form #ids-users .label {
text-transform: capitalize;
}

/* line 456, ../sass/screen.scss */
/* line 475, ../sass/screen.scss */
.produit-create #jours-production .form-group {
float: left;
margin-right: 15px;
}
/* line 460, ../sass/screen.scss */
/* line 479, ../sass/screen.scss */
.produit-create #jours-production .form-group label {
font-weight: normal;
}
/* line 465, ../sass/screen.scss */
/* line 484, ../sass/screen.scss */
.produit-create .field-produit-id_etablissement {
display: none;
}

/* line 471, ../sass/screen.scss */
/* line 490, ../sass/screen.scss */
.produit-index .td-photo {
max-width: 100px;
width: 100px;
}
/* line 475, ../sass/screen.scss */
/* line 494, ../sass/screen.scss */
.produit-index .photo-produit {
max-width: 100px;
}

+ 19
- 0
backend/web/sass/screen.scss Переглянути файл

@@ -213,6 +213,25 @@ a {
padding-top: 2px ;
}
}
#bloc-production {
.label {
float: right ;
font-size: 13px ;
}
.btn-success {
background-color: #5cb85c ;
border-color: #4cae4c ;
}
#btn-export-commandes {
float: right ;
margin-top: 20px ;
}
}
#produits-production {

Завантаження…
Відмінити
Зберегти