Skip to content
Snippets Groups Projects

Add possibility to use Favorites

Merged CaTasTrOOf requested to merge CaTasTrOOf/wotwizard-ui:favourites-filter into master
6 files
+ 70
35
Compare changes
  • Side-by-side
  • Inline
Files
6
+ 28
13
@@ -119,6 +119,10 @@ export default {
@@ -119,6 +119,10 @@ export default {
type: Boolean,
type: Boolean,
default: false
default: false
},
},
 
certif: {
 
type: Boolean,
 
default: false
 
},
defaultSortDir: {
defaultSortDir: {
type: String,
type: String,
default: "asc"
default: "asc"
@@ -140,6 +144,7 @@ export default {
@@ -140,6 +144,7 @@ export default {
},
},
date(member) {
date(member) {
if (this.adhesion) return member.limitDate
if (this.adhesion) return member.limitDate
 
if (this.certif) return member.received_certifications.limit
return Math.min(member.limitDate, member.received_certifications.limit)
return Math.min(member.limitDate, member.received_certifications.limit)
}
}
},
},
@@ -153,24 +158,34 @@ export default {
@@ -153,24 +158,34 @@ export default {
if (this.currentSort == "uid") {
if (this.currentSort == "uid") {
if (a["uid"].toLowerCase() < b["uid"].toLowerCase())
if (a["uid"].toLowerCase() < b["uid"].toLowerCase())
return -1 * modifier
return -1 * modifier
if (a["uid"].toLowerCase() > b["uid"].toLowerCase())
return 1 * modifier
return 1 * modifier
} else if (this.currentSort == "pubkey") {
} else if (this.currentSort == "pubkey") {
if (a["pubkey"].toLowerCase() < b["pubkey"].toLowerCase())
if (a["pubkey"].toLowerCase() < b["pubkey"].toLowerCase())
return -1 * modifier
return -1 * modifier
if (a["pubkey"].toLowerCase() > b["pubkey"].toLowerCase())
return 1 * modifier
return 1 * modifier
} else if (this.currentSort == "date_sortie") {
} else if (this.currentSort == "date_sortie") {
if (
if (this.adhesion) {
Math.min(a["limitDate"], a["received_certifications"]["limit"]) <
if (a["limitDate"] < b["limitDate"]) return -1 * modifier
Math.min(b["limitDate"], b["received_certifications"]["limit"])
return 1 * modifier
)
} else if (this.certif) {
return -1 * modifier
if (
if (
a["received_certifications"]["limit"] <
Math.min(a["limitDate"], a["received_certifications"]["limit"]) >
b["received_certifications"]["limit"]
Math.min(b["limitDate"], b["received_certifications"]["limit"])
)
)
return -1 * modifier
 
return 1 * modifier
 
} else {
 
let minA = Math.min(
 
a["limitDate"],
 
a["received_certifications"]["limit"]
 
)
 
let minB = Math.min(
 
b["limitDate"],
 
b["received_certifications"]["limit"]
 
)
 
if (minA < minB) return -1 * modifier
return 1 * modifier
return 1 * modifier
 
}
}
}
return 0
return 0
Loading