Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix #768

Merged
merged 6 commits into from
Oct 10, 2024
Merged

Bugfix #768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4e67460
fix ctrl mut not working
rufener Jul 12, 2024
b284646
fix affaire_urgente nb jours
rufener Sep 9, 2024
2d7cf58
Merge branch 'master' of https://github.com/sitn/infolica into bugfix
rufener Sep 13, 2024
26098aa
fix delete reserved number
rufener Sep 13, 2024
106d72f
Clarification du type de recherche de numéro
rufener Oct 9, 2024
cb398aa
order by number desc in number search
rufener Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion back/infolica/views/numero.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def numeros_search_view(request):
# filter by conditions
query = request.dbsession.query(VNumeros).order_by(
VNumeros.cadastre,
VNumeros.numero.asc()
VNumeros.numero.desc()
).filter(*conditions)

query = query.filter(VNumeros.type_numero_id <= 4)
Expand Down
2 changes: 1 addition & 1 deletion front/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ VUE_APP_API_URL="{API_URL}"

PUBLIC_PATH = "{PUBLIC_PATH}"
VUE_APP_STATUS = "development"
VUE_APP_VERSION = "1.11.10"
VUE_APP_VERSION = "1.12.1"


#==================================
Expand Down
2 changes: 1 addition & 1 deletion front/src/components/Affaires/AffairesDashboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ export default {

obj.urgent_echeance_reste = null;
if (obj.urgent_echeance !== null) {
obj.urgent_echeance_reste = Math.ceil(Math.max(0, moment(obj.urgent_echeance, process.env.VUE_APP_DATEFORMAT_CLIENT).add(1, 'd') -new Date())/1000/3600/24);
obj.urgent_echeance_reste = Math.ceil(Math.max(0, moment(obj.urgent_echeance, process.env.VUE_APP_DATEFORMAT_CLIENT) -new Date())/1000/3600/24);
}

// reset emptyPage
Expand Down
8 changes: 5 additions & 3 deletions front/src/components/Affaires/ControleMutation/ControleMutation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default {
.then(response => {
if (response && response.data) {
this.controleMutation = response.data;

// set dates to client format
this.controleMutation = setDateFormatClient(this.controleMutation);

Expand Down Expand Up @@ -106,7 +106,7 @@ export default {

/**
* Save
*/
*/
onConfirmEditControleMutation() {
var formData = new FormData();
formData.append("id", this.controleMutation.id);
Expand Down Expand Up @@ -135,11 +135,13 @@ export default {
formData.append("cs_6", this.controleMutation.cs_6);
formData.append("cs_7", this.controleMutation.cs_7);
formData.append("cs_8", this.controleMutation.cs_8);
formData.append("cs_9", this.controleMutation.cs_9);
formData.append("od_1", this.controleMutation.od_1);
formData.append("od_2", this.controleMutation.od_2);
formData.append("od_3", this.controleMutation.od_3);
formData.append("od_4", this.controleMutation.od_4);
formData.append("od_5", this.controleMutation.od_5);
formData.append("od_6", this.controleMutation.od_6);
formData.append("bat_1", this.controleMutation.bat_1);
formData.append("bat_2", this.controleMutation.bat_2);
formData.append("bat_3", this.controleMutation.bat_3);
Expand All @@ -159,7 +161,7 @@ export default {
formData.append("gen_4", this.controleMutation.gen_4);
formData.append("date", moment(new Date()).format(process.env.VUE_APP_DATEFORMAT_WS));
formData.append("visa", JSON.parse(localStorage.getItem("infolica_user")).id);

this.$http
.put(
process.env.VUE_APP_API_URL +
Expand Down
2 changes: 1 addition & 1 deletion front/src/components/Affaires/NumerosAffaire/NumerosAffaire.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ export default {
this.confirmDialog = {
show: true,
title: "Confirmer la suppression d'un numéro de bien-fonds",
content: `En cliquant sur "confirmer", le bien-fonds ${item.numero} (cadastre: ${item.numero_cadastre}) sera définitivement supprimé.`,
content: `En cliquant sur "confirmer", le bien-fonds ${item.numero} (cadastre: ${item.numero_cadastre}) sera retiré de la balance (si déjà saisie) et définitivement supprimé.`,
onConfirm: () => this.deleteReservedNumber(item),
}
},
Expand Down
4 changes: 2 additions & 2 deletions front/src/components/Affaires/NumerosAffaire/numerosAffaire.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@
</md-button>
</div>
</md-table-cell>
<md-table-cell md-label="Supprimer " class="removecolumn">
<md-button v-if="affaire.date_envoi === null" @click="confirmDeleteReservedNumber(item)"
<md-table-cell md-label="Supprimer " class="removecolumn" v-if="affaire.date_envoi === null">
<md-button @click="confirmDeleteReservedNumber(item)"
class="md-accent md-icon-button md-dense" title="Supprimer le bien-fonds réservé">
<md-icon>delete</md-icon>
</md-button>
Expand Down
2 changes: 2 additions & 0 deletions front/src/components/Numeros/numeros.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ <h1>Immeubles et numéros</h1>
<!-- Search Header -->
<md-card-header>
<div class="md-title">Immeubles</div>
<div class="md-subhead">BF, DDP, PPE, PCOP</div>
</md-card-header>

<!-- Search Content -->
Expand Down Expand Up @@ -118,6 +119,7 @@ <h1 class="md-title">Résultat</h1>
<md-card>
<md-card-header>
<div class="md-title">Numéro de la MO - Affaire liée</div>
<div class="md-subhead">Bât, DP, PFP3, Pt aux, Pt dét</div>
</md-card-header>
<md-card-content>
<div class="md-layout md-gutter">
Expand Down