Skip to content

Commit 95879d2

Browse files
alainabbasalainabbas
committed
correction de bugs
1 parent 11f927f commit 95879d2

File tree

5 files changed

+85
-27
lines changed

5 files changed

+85
-27
lines changed

‎src/components/settings/sms.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
<q-input style="width:50%" type="text" outlined v-model="host" label="Serveur SMPP (URL smpp://...) " dense/>
99
</div>
1010
<div class="row">
11-
<q-input style="width:30%" type="text" outlined v-model="systemId" label="System ID" dense/>
11+
<q-input style="width:50%" type="text" outlined v-model="systemId" label="System ID" dense/>
1212
</div>
1313
<div class="row">
14-
<q-input style="width:30%" :type="typePasswordProp" outlined v-model="password" label="Mot de passe" dense>
14+
<q-input style="width:50%" :type="typePasswordProp" outlined v-model="password" label="Mot de passe" dense>
1515
<template v-slot:append>
1616
<q-icon name="mdi-eye" @click="togglePassword" style="cursor: pointer;"/>
1717
</template>
1818
</q-input>
1919
</div>
2020
<div class="row">
21-
<q-input style="width:30%" type="text" outlined v-model="sourceAddr" label="Nom ou numéro de l'emetteur" dense/>
21+
<q-input style="width:50%" type="text" outlined v-model="sourceAddr" label="Nom ou numéro de l'emetteur" dense/>
2222
</div>
2323
<div class="q-pa-md q-gutter-sm fixed-bottom">
2424
<q-btn color="primary" style="width: 100%" @click="saveParams">

‎src/components/settings/smtp.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<q-input style="width:50%" type="text" outlined v-model="host" label="Serveur SMTP (URL smtp://...) " dense/>
99
</div>
1010
<div class="row">
11-
<q-input style="width:30%" type="text" outlined v-model="emetteur" label="Adresse emetteur" dense/>
11+
<q-input style="width:50%" type="text" outlined v-model="emetteur" label="Adresse emetteur" dense/>
1212
</div>
1313
<div class="row">
14-
<q-input style="width:30%" type="text" outlined v-model="username" label="Compte SMTP" dense/>
14+
<q-input style="width:50%" type="text" outlined v-model="username" label="Compte SMTP" dense/>
1515
</div>
1616
<div class="row">
17-
<q-input style="width:30%" :type="typePasswordProp" outlined v-model="password" label="Mot de passe" dense>
17+
<q-input style="width:50%" :type="typePasswordProp" outlined v-model="password" label="Mot de passe" dense>
1818
<template v-slot:append>
1919
<q-icon name="mdi-eye" @click="togglePassword" style="cursor: pointer;"/>
2020
</template>

‎src/components/table/top-left.vue‎

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import updateInitModale from '../updateInitModale.vue'
2121
import { useIdentityStates } from '#imports'
2222
import { IdentityState } from '~/composables'
2323
import { useIdentityStateStore } from '~/stores/identityState'
24+
import {computed} from "vue";
2425
2526
const $q = useQuasar()
2627
@@ -29,6 +30,10 @@ const props = defineProps({
2930
type: Array as PropType<any[]>,
3031
default: () => [],
3132
},
33+
total: {
34+
type: Number,
35+
default:0
36+
}
3237
})
3338
3439
const emit = defineEmits(['updateLifestep', 'clear', 'refresh'])
@@ -73,8 +78,18 @@ function openUpdateModale() {
7378
console.log('cancelSync')
7479
})
7580
}
81+
function returnFilter(){
82+
83+
const rest = route.query
84+
let filters={}
85+
for (const [key, value] of Object.entries(rest)){
86+
if (key === 'limit' || key === 'skip' || key === 'sort' || key === 'read'){
87+
delete rest[key]
88+
}
89+
}
90+
return rest
91+
}
7692
function openInitModale() {
77-
const query = route.query || {}
7893
// console.log('filters', route.query)
7994
// console.log('props.selected', props.selected)
8095
// const identityState: IdentityState = parseInt(`${query['filters[@state][]']}`, 10)
@@ -86,22 +101,24 @@ function openInitModale() {
86101
console.log('openInitModale', identityState)
87102
88103
const name = getStateName(identityState)
89-
const count = getStateValue(identityState)
104+
90105
91106
$q.dialog({
92107
component: updateInitModale,
93108
componentProps: {
94109
selectedIdentities: props.selected,
95110
identityTypesName: name,
96-
allIdentitiesCount: count,
111+
allIdentitiesCount: 0,
97112
},
98113
})
99114
.onOk(async (data) => {
100-
console.log('initIdentities', data)
101-
data.syncAllIdentities ? await sendInitToAllIdentities(identityState) : await sendInitToIdentity(props.selected, identityState)
115+
if (data.initAllIdentities === true){
116+
await sendInitToAllIdentities()
117+
}else{
118+
await sendInitToIdentity(props.selected)
119+
}
102120
})
103121
.onCancel(() => {
104-
console.log('cancelinit')
105122
})
106123
}
107124
function getTargetState(state: IdentityState) {
@@ -162,9 +179,7 @@ async function updateIdentity(identities, state: IdentityState) {
162179
emit('clear')
163180
}
164181
165-
async function sendInitToIdentity(identities, state: IdentityState) {
166-
const targetState = getTargetState(state)
167-
182+
async function sendInitToIdentity(identities) {
168183
console.log('updateIdentity', identities)
169184
const ids = identities.map((identity) => identity._id)
170185
const { data, error } = await useHttp(`/management/passwd/initmany`, {
@@ -191,19 +206,19 @@ async function sendInitToIdentity(identities, state: IdentityState) {
191206
emit('clear')
192207
}
193208
194-
async function sendInitToAllIdentities(state: IdentityState) {
195-
const { data: identities } = await useHttp(`/management/identities?limit=999999&&filters[@state][]=${state}`, {
209+
async function sendInitToAllIdentities() {
210+
const { data: identities } = await useHttp('/management/identities?limit=99999', {
196211
method: 'get',
212+
query:returnFilter()
197213
})
198-
199214
if (!identities) {
200215
$q.notify({
201216
message: 'Aucune identité trouvée',
202217
color: 'negative',
203218
})
204219
return
205220
}
206-
sendInitToIdentity(identities.value.data, state)
221+
sendInitToIdentity(identities.value.data)
207222
}
208223
209224

‎src/components/updateInitModale.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ const props = defineProps({
4848
type: Number,
4949
required: true,
5050
default: 0,
51-
},
51+
}
5252
})
5353
5454
defineEmits([...useDialogPluginComponent.emits])
5555
5656
const mainText = computed(() => `Vous êtes sur le point d envoyer une invitation à ${props.selectedIdentities.length} identités "${props.identityTypesName}". Voulez-vous continuer ?`)
5757
5858
const checkboxLabel = computed(() => {
59-
return `Envoyer l\'invitation à toutes les identités "${props.identityTypesName}" (${props.allIdentitiesCount})`
59+
return `Envoyer l\'invitation à toutes les identités (${props.allIdentitiesCount})`
6060
})
6161
6262
const initAllIdentities = ref(false)

‎src/pages/identities/outdated.vue‎

Lines changed: 49 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import {ref} from "vue";
3030
import updateInitModale from "../../components/updateInitModale.vue";
3131
import {useQuasar} from "quasar";
32-
32+
let rowsCount=0
3333
const selected=ref([])
3434
const $q=useQuasar()
3535
const { data: fieldsName, pending1, error1} = await useHttp('/management/identities/validation', {
@@ -48,37 +48,80 @@ const { data: fieldsName, pending1, error1} = await useHttp('/management/identit
4848
const { data: rows1, pending, error, refresh } = await useHttp('/management/passwd/ioutdated', {
4949
method: 'GET',
5050
transform: (result)=>{
51+
rowsCount=result.data.length
5152
const allFields=result.data.map((enr)=>{
5253
let addF={}
5354
for (const [key, value] of Object.entries(enr?.additionalFields?.attributes||{})) {
5455
addF = {...addF, ...value}
5556
}
56-
const step1={...enr.inetOrgPerson,...addF}
57+
const step1={_id:enr._id,...enr.inetOrgPerson,...addF}
5758
return step1
5859
})
5960
return allFields
6061
}
6162
});
6263
6364
function openInitModale() {
64-
65-
6665
$q.dialog({
6766
component: updateInitModale,
6867
componentProps: {
6968
selectedIdentities: selected.value,
7069
identityTypesName: name,
71-
allIdentitiesCount: rows1.length,
70+
allIdentitiesCount: rows1.value.length
7271
},
7372
})
7473
.onOk(async (data) => {
7574
console.log('initIdentities', data)
76-
data.syncAllIdentities ? await sendInitToAllIdentities(identityState) : await sendInitToIdentity(props.selected, identityState)
75+
data.initAllIdentities ? await sendInitToAllIdentities() : await sendInitToIdentity(selected.value)
7776
})
7877
.onCancel(() => {
7978
console.log('cancelinit')
8079
})
8180
}
81+
async function sendInitToIdentity(identities) {
82+
83+
console.log('updateIdentity', identities)
84+
const ids = identities.map((identity) => identity._id)
85+
const { data, error } = await useHttp(`/management/passwd/initmany`, {
86+
method: 'post',
87+
body: {
88+
ids
89+
},
90+
})
91+
92+
if (error.value) {
93+
$q.notify({
94+
message: error.value.data.message,
95+
color: 'negative',
96+
})
97+
return
98+
}
99+
100+
$q.notify({
101+
message: `Les identités ont été mises à jour avec succès`,
102+
color: 'positive',
103+
})
104+
emit('refresh')
105+
emit('clear')
106+
}
107+
108+
async function sendInitToAllIdentities() {
109+
const { data: identities } = await useHttp('/management/passwd/ioutdated', {
110+
method: 'get',
111+
})
112+
113+
if (!identities) {
114+
$q.notify({
115+
message: 'Aucune identité trouvée',
116+
color: 'negative',
117+
})
118+
return
119+
}
120+
sendInitToIdentity(identities.value.data, state)
121+
}
122+
123+
124+
82125
</script>
83126
84127
<style scoped>

0 commit comments

Comments
 (0)