Skip to content

Commit 1657666

Browse files
mask-03mask-03
committed
Cambios en la forma de mostrar las pred
1 parent 6d08858 commit 1657666

4 files changed

Lines changed: 56 additions & 50 deletions

File tree

‎estimator/predictions/views.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class PredictionListView(LoginRequiredMixin, ListView):
7979
def get_queryset(self):
8080
new_context = PredictionSale.objects.filter(
8181
company=self.request.user.safe_company
82-
).order_by('-prediction_date')
82+
).order_by('-created')
8383
return new_context
8484

8585
def get_context_data(self, **kwargs):

‎estimator/templates/home.html‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ <h5 class="app__text--gray-700">
6868
<div class="container-fluid">
6969
<div class="row justify-content-md-center">
7070
{% for pred in prediction.predictions %}
71-
<div class="col-12 col-md-6 col-lg-3 pb-3">
72-
<div class="card">
71+
<div class="d-flex col-12 col-md-6 col-lg-3 pb-3">
72+
<div class="card w-100">
7373
<div class="card-header">
7474
<div class="d-flex flex-row justify-content-between align-items-center">
7575
<h6 class="font-weight-bold m-0">
@@ -88,17 +88,17 @@ <h6 class="font-weight-bold m-0">
8888
{{pred.amount}} {{pred.raw_material.unit_name}}
8989
</span>
9090
</p>
91-
<p class="small">
91+
<p class="app__text--gray-700">
9292
La cantidad tiene una tendencia
9393
{% if pred.amount_trend > 0 %}
9494
al alza
95-
<i class="mdi app__text--cyan mdi-arrow-top-right"></i>
95+
<i class="mdi app__text--cyan mdi-arrow-up-bold"></i>
9696
{% elif pred.amount_trend < 0 %}
9797
a la baja
98-
<i class="mdi app__text--red mdi-arrow-bottom-right"></i>
98+
<i class="mdi app__text--red mdi-arrow-down-bold"></i>
9999
{% else %}
100100
estable
101-
<i class="mdi mdi-arrow-right"></i>
101+
<i class="mdi mdi-arrow-right-bold"></i>
102102
{% endif %}
103103
</p>
104104
<p class="mb-0">
@@ -112,17 +112,17 @@ <h6 class="font-weight-bold m-0">
112112
<span class="app__text--gray-600">Moneda Local:</span>
113113
<span class="font-weight-bold">{{pred.cost_local | es_money }} Bs</span>
114114
</p>
115-
<p class="small">
115+
<p class="app__text--gray-700">
116116
El costo tiene una tendencia
117117
{% if pred.cost_trend > 0 %}
118118
al alza
119-
<i class="mdi app__text--cyan mdi-arrow-top-right"></i>
119+
<i class="mdi app__text--cyan mdi-arrow-up-bold"></i>
120120
{% elif pred.cost_trend < 0 %}
121121
a la baja
122-
<i class="mdi app__text--red mdi-arrow-bottom-right"></i>
122+
<i class="mdi app__text--red mdi-arrow-down-bold"></i>
123123
{% else %}
124124
estable
125-
<i class="mdi mdi-arrow-right"></i>
125+
<i class="mdi mdi-arrow-right-bold"></i>
126126
{% endif %}
127127
</p>
128128
</div>

‎estimator/templates/predictions/prediction_detail.html‎

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,36 @@ <h4 class="text-center font-weight-bold text-uppercase">
2929
<div class="col-12">
3030
<div class="container-fluid py-3 app__background--white rounded shadow">
3131
<div class="row pb-3">
32-
<div class="col-1">
32+
<div class="col-12 col-md-2">
3333
<a href="#donwloadPdf" @click="savePdf"
3434
class="m-1 rounded-pill app__button button--fab button--blue mdl-button mdl-js-button mdl-button--fab mdl-button--mini-fab mdl-js-ripple-effect"
3535
title="Descargar PDF">
3636
<i class="mdi mdi-file-pdf-box-outline"></i>
3737
</a>
3838
</div>
39-
<div class="d-flex align-content-center border app__border--gray-300 rounded p-2">
40-
<label for="graphs_selector">Selecciona Graficas a Mostrar</label>
41-
<div class="col">
42-
<select id="graphs_selector" v-model="selected_graphs" class="selectpicker" data-live-search="true" multiple=""title="Selecciona Varias">
43-
<option v-for="option in graphed_materials" v-bind:value="option.key">
44-
[[option.name]]
45-
</option>
46-
</select>
39+
<div class="col-10">
40+
<div class="form-row">
41+
<div class="form-group col-12 col-md-4">
42+
<div class="app__form--textfield w-100">
43+
<label class="ml-auto" for="graphs_selector">
44+
Seleccione las gráficas a mostrar
45+
</label>
46+
</div>
47+
</div>
48+
<div class="form-group col-12 col-md-4">
49+
<div class="app__form--select w-100">
50+
<select id="graphs_selector" v-model="selected_graphs" class="selectpicker" data-live-search="true" multiple=""title="Selecciona">
51+
<option v-for="option in graphed_materials" v-bind:value="option.key">
52+
[[option.name]]
53+
</option>
54+
</select>
55+
</div>
56+
</div>
4757
</div>
4858
</div>
4959
</div>
60+
61+
<!-- Div que aparece en el pdf -->
5062
<div class="" id="pdfContent">
5163
<div class="row d-none headerControl">
5264
<div class="col app__text--gray-600">
@@ -88,8 +100,8 @@ <h5 class="app__text--gray-700">
88100
<div class="container-fluid">
89101
<div class="row justify-content-md-center">
90102
{% for pred in object.predictions %}
91-
<div class="col-12 col-md-6 col-lg-3 pb-3 columnsControl">
92-
<div class="card">
103+
<div class="d-flex col-12 col-md-6 col-lg-3 pb-3 columnsControl">
104+
<div class="card w-100">
93105
<div class="card-header">
94106
<div
95107
class="d-flex flex-row justify-content-between align-items-center">
@@ -111,17 +123,17 @@ <h6 class="font-weight-bold m-0">
111123
{{pred.amount}} {{pred.raw_material.unit_name}}
112124
</span>
113125
</p>
114-
<p class="small">
126+
<p class="app__text--gray-700">
115127
La cantidad tiene una tendencia
116128
{% if pred.amount_trend > 0 %}
117129
al alza
118-
<i class="mdi app__text--cyan mdi-arrow-top-right"></i>
130+
<i class="mdi app__text--cyan mdi-arrow-up-bold"></i>
119131
{% elif pred.amount_trend < 0 %}
120132
a la baja
121-
<i class="mdi app__text--red mdi-arrow-bottom-right"></i>
133+
<i class="mdi app__text--red mdi-arrow-down-bold"></i>
122134
{% else %}
123135
estable
124-
<i class="mdi mdi-arrow-right"></i>
136+
<i class="mdi mdi-arrow-right-bold"></i>
125137
{% endif %}
126138
</p>
127139
<p class="mb-0">
@@ -137,17 +149,17 @@ <h6 class="font-weight-bold m-0">
137149
<span class="font-weight-bold">{{pred.cost_local | es_money }}
138150
Bs</span>
139151
</p>
140-
<p class="small">
152+
<p class="app__text--gray-700">
141153
El costo tiene una tendencia
142154
{% if pred.cost_trend > 0 %}
143155
al alza
144-
<i class="mdi app__text--cyan mdi-arrow-top-right"></i>
156+
<i class="mdi app__text--cyan mdi-arrow-up-bold"></i>
145157
{% elif pred.cost_trend < 0 %}
146158
a la baja
147-
<i class="mdi app__text--red mdi-arrow-bottom-right"></i>
159+
<i class="mdi app__text--red mdi-arrow-down-bold"></i>
148160
{% else %}
149161
estable
150-
<i class="mdi mdi-arrow-right"></i>
162+
<i class="mdi mdi-arrow-right-bold"></i>
151163
{% endif %}
152164
</p>
153165
</div>
@@ -175,7 +187,6 @@ <h6 class="font-weight-bold m-0">
175187
</div>
176188
</div>
177189
</div>
178-
<br>
179190

180191
{% comment %} <div class='hidden_charts_pdf d-none' id="hidden_charts_pdf">
181192
<template v-for="(el, j) in selected_graphs">
@@ -198,14 +209,14 @@ <h6 class="font-weight-bold text-uppercase m-0">
198209
</div>
199210
</template>
200211
</div> {% endcomment %}
212+
</div>
213+
<!-- Final del div que aparece en el pdf -->
201214

202-
</div><!-- Final del div que aparece en el pdf -->
203-
204-
205-
<div class="row justify-content-center" id="charts_controls"> <!-- Div de las graficas -->
215+
<!-- Div de las graficas -->
216+
<div class="row justify-content-center" id="charts_controls">
206217
<template v-for="(el, j) in selected_graphs">
207-
<div class="col-12 pb-3 my-4 text-center text-capitalize"
208-
v-for="(graph, index) in getDictGraphs(el)" :key="'m_' + index">
218+
<div class="col-12 px-4 pt-3 text-center text-capitalize"
219+
v-for="(graph, index) in getDictGraphs(el)" :key="el + '_mg_' + index">
209220
<div class="card">
210221

211222
<div class="card-header">
@@ -246,13 +257,12 @@ <h6 class="font-weight-bold text-uppercase m-0">
246257
</div>
247258
</div>
248259
</template>
249-
</div> <!-- Final del div de las graficas -->
250-
251-
260+
</div>
261+
<!-- Final del div de las graficas -->
262+
252263
</div>
253264
</div>
254265
</div>
255-
256266
</div>
257267
</div>
258268

@@ -365,11 +375,9 @@ <h6 class="font-weight-bold text-uppercase m-0">
365375

366376
let itm = document.getElementById("pdfContent");
367377

368-
369-
370378
let cln = itm.cloneNode(true);
371379
let cols_inner = cln.getElementsByClassName("columnsControl");
372-
380+
373381
let head_inner = cln.getElementsByClassName("headerControl");
374382

375383
let charts_inner = cln.getElementsByClassName("hidden_charts_pdf");
@@ -387,7 +395,6 @@ <h6 class="font-weight-bold text-uppercase m-0">
387395
charts_inner[i].classList.remove("d-none");
388396
}
389397

390-
391398
div.appendChild(cln);
392399
html2pdf(div, {
393400
margin: 0.5,
@@ -397,7 +404,6 @@ <h6 class="font-weight-bold text-uppercase m-0">
397404
jsPDF: { unit: 'in', format: 'letter', orientation: 'portrait' }
398405
});
399406

400-
401407
},
402408
getToday: function() {
403409
let today = new Date();

‎estimator/templates/predictions/show_prediction.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ <h4 class="text-center font-weight-bold text-uppercase app__text--cyan">
4949
</div>
5050
<div class="row pb-4 justify-content-md-center">
5151
{% for pred in predicted_materials %}
52-
<div class="col-12 col-md-6 col-lg-3 pb-3">
53-
<div class="card">
52+
<div class="d-flex col-12 col-md-6 col-lg-3 pb-3">
53+
<div class="card w-100">
5454
<div class="card-header">
5555
<div class="d-flex flex-row justify-content-between align-items-center">
5656
<h6 class="font-weight-bold m-0">
@@ -69,7 +69,7 @@ <h6 class="font-weight-bold m-0">
6969
{{pred.amount}} {{pred.raw_material.unit_name}}
7070
</span>
7171
</p>
72-
<p class="">
72+
<p class="app__text--gray-700">
7373
La cantidad tiene una tendencia
7474
{% if pred.amount_trend > 0 %}
7575
al alza
@@ -93,7 +93,7 @@ <h6 class="font-weight-bold m-0">
9393
<span class="app__text--gray-600">Moneda Local:</span>
9494
<span class="font-weight-bold">{{pred.cost_local | es_money }} Bs</span>
9595
</p>
96-
<p class="">
96+
<p class="app__text--gray-700">
9797
El costo tiene una tendencia
9898
{% if pred.cost_trend > 0 %}
9999
al alza

0 commit comments

Comments
 (0)