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

Stats admin page #70

Merged
merged 10 commits into from
Jul 8, 2021
Merged

Stats admin page #70

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fde1624
init super admin statistic page
lpedrau May 4, 2021
280b608
new page stats for super admin
lpedrau May 6, 2021
734aaa2
add traductions and new stat
lpedrau May 6, 2021
06a4fb9
add translations and fix pie chart when no data found
lpedrau May 7, 2021
d637bbd
add tests statistics page
lpedrau May 18, 2021
86c8ddb
fix translation
lpedrau May 19, 2021
6effda6
Merge branch 'develop' into stats_admin_page
lpedrau May 19, 2021
d87089c
changes for PR
lpedrau Jun 7, 2021
5e84985
Merge branch 'stats_admin_page' of https://github.com/Tanaguru/tanagu…
lpedrau Jun 7, 2021
aff5f35
fix check date with variables
lpedrau Jul 7, 2021
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
Prev Previous commit
Next Next commit
changes for PR
  • Loading branch information
@lpedrau
lpedrau committed Jun 7, 2021
commit d87089c20e1615c922105cef66eb48d67658bf29
20 changes: 20 additions & 0 deletions src/helper/DateHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
const DateHelper = {
checkValidDate(date) {
let dateRegex = null;
let result = false;
if(this.$i18n.locale.toLowerCase() == 'en'){
dateRegex = /^(0[1-9]|1[012])[/](0[1-9]|[12][0-9]|3[01])[/](19|20)\d\d$/
} else {
dateRegex = /^(0[1-9]|[12][0-9]|3[01])[/](0[1-9]|1[012])[/](19|20)\d\d$/
}

if(dateRegex.test(date)){
result = true;
} else {
result = false;
}
return result;
}
}

export default DateHelper;
48 changes: 11 additions & 37 deletions src/views/Admin/Stats/Stats.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<div class="form-block">
<div>
<h3> {{ $t('statistics.nbAuditByType') }} </h3>
<Piechart :nbPage="stats.nbPAGEAudit" :nbSite="stats.nbSITEAudit" :nbScenario="stats.nbSCENARIOAudit" :nbFile="stats.nbUPLOADAudit"></Piechart>
<Piechart :nbPage="stats.nbPageAudit" :nbSite="stats.nbSiteAudit" :nbScenario="stats.nbScenarioAudit" :nbFile="stats.nbUploadAudit"></Piechart>
</div>
</div>
</div>
Expand All @@ -64,18 +64,6 @@
<div class="form-block">
<label class="label" for="dateStart"> {{ $t('statistics.dateForm.dateStart') }} </label>
<input
v-if="$i18n.locale.toLowerCase() == 'en'"
class="input"
v-bind:class="{'has-error': dateForm.dateStartError}"
type="text"
name="dateStart"
id="dateStart"
v-model="dateForm.dateStart"
:aria-describedby="dateForm.dateError ? 'date-error' : ''"
required>

<input
v-else
class="input"
v-bind:class="{'has-error': dateForm.dateStartError}"
type="text"
Expand All @@ -91,18 +79,6 @@
<div class="form-block">
<label class="label" for="dateEnd"> {{ $t('statistics.dateForm.dateEnd') }} </label>
<input
v-if="$i18n.locale.toLowerCase() == 'en'"
class="input"
v-bind:class="{'has-error': dateForm.dateEndError}"
type="text"
name="dateEnd"
id="dateEnd"
v-model="dateForm.dateEnd"
:aria-describedby="dateForm.dateError ? 'date-error' : ''"
required>

<input
v-else
class="input"
v-bind:class="{'has-error': dateForm.dateEndError}"
type="text"
Expand Down Expand Up @@ -150,6 +126,7 @@
<script>

import Piechart from "../../../components/charts/PieChart";
import DateHelper from '../../../helper/DateHelper';

export default {
components: { Piechart },
Expand All @@ -164,10 +141,10 @@ export default {
meanNbErrorsPage: 0,
meanNbErrorsProject: 0,
meanNbErrorsAudit: 0,
nbSITEAudit: 0,
nbPAGEAudit: 0,
nbSCENARIOAudit: 0,
nbUPLOADAudit: 0,
nbSiteAudit: 0,
nbPageAudit: 0,
nbScenarioAudit: 0,
nbUploadAudit: 0,
meanNbAuditsByProject: 0,
meanNbUsersByProject: 0
},
Expand Down Expand Up @@ -195,6 +172,7 @@ export default {
this.loadStats();
},
methods: {
checkValidDate: DateHelper.checkValidDate,
loadStats(){
this.statsService.getStats(
stats => {
Expand All @@ -204,18 +182,14 @@ export default {
);
},
checkDate() {
let dateRegex = null;
if(this.$i18n.locale.toLowerCase() == 'en'){
dateRegex = /^(0[1-9]|1[012])[/](0[1-9]|[12][0-9]|3[01])[/](19|20)\d\d$/
} else { dateRegex = /^(0[1-9]|[12][0-9]|3[01])[/](0[1-9]|1[012])[/](19|20)\d\d$/ }

if(dateRegex.test(this.dateForm.dateEnd) && dateRegex.test(this.dateForm.dateStart) ){

if(this.checkValidDate(this.dateForm.dateEnd) && this.checkValidDate(this.dateForm.dateStart) ){
return true;
} else if( !dateRegex.test(this.dateForm.dateEnd) && !dateRegex.test(this.dateForm.dateStart) ) {
} else if( !this.checkValidDate(this.dateForm.dateEnd) && !this.checkValidDate(this.dateForm.dateStart) ) {
this.dateForm.dateEndError = this.$i18n.t('statistics.dateForm.invalidDateEnd')
this.dateForm.dateStartError = this.$i18n.t('statistics.dateForm.invalidDateStart')
return false;
} else if( !dateRegex.test(this.dateForm.dateEnd) ){
} else if( !this.checkValidDate(this.dateForm.dateEnd) ){
lpedrau marked this conversation as resolved.
Show resolved Hide resolved
this.dateForm.dateEndError = this.$i18n.t('statistics.dateForm.invalidDateEnd')
return false;
}else{
Expand Down