Skip to content
Snippets Groups Projects
Commit 7783eba8 authored by nicrausaz's avatar nicrausaz
Browse files

Séparation en composants, formatage des dates

parent 09a6485e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 121 additions and 116 deletions
canapGEST/Documentation/journal_travail.xlsx
+ 0
− 0
View file @ 7783eba8
No preview for this file type
canapGEST/Documentation/planification_etatActuel_NicolasCrausaz - Copy.xlsx
+ 0
− 0
View file @ 7783eba8
No preview for this file type
canapGEST/Site/src/components/application/applicationComments.vue
+ 98
− 1
View file @ 7783eba8
<template>
<div id="application-comments"></div>
<div id="application-comments">
{{$store.state.moduleApplications.currentApplication.comments}}
<v-card dark flat>
<v-btn absolute bottom color="pink" right fab>
<v-icon>mdi-plus</v-icon>
</v-btn>
<v-card-title class="pa-2 purple lighten-3">
<v-btn icon>
<v-icon>mdi-menu</v-icon>
</v-btn>
<h3 class="title font-weight-light text-xs-center grow">Timeline</h3>
<v-avatar>
<v-img
src="https://avataaars.io/?avatarStyle=Circle&topType=LongHairStraight&accessoriesType=Blank&hairColor=BrownDark&facialHairType=Blank&clotheType=BlazerShirt&eyeType=Default&eyebrowType=Default&mouthType=Default&skinColor=Light"
></v-img>
</v-avatar>
</v-card-title>
<v-img
src="https://cdn.vuetifyjs.com/images/cards/forest.jpg"
gradient="to top, rgba(0,0,0,.44), rgba(0,0,0,.44)"
>
<v-container fill-height>
<v-layout align-center>
<strong class="display-4 font-weight-regular mr-4">8</strong>
<v-layout column justify-end>
<div class="headline font-weight-light">Monday</div>
<div class="text-uppercase font-weight-light">February 2015</div>
</v-layout>
</v-layout>
</v-container>
</v-img>
</v-card>
<v-card-text class="py-0">
<v-timeline align-top dense>
<v-timeline-item color="pink" small>
<v-layout pt-3>
<v-flex xs3>
<strong>5pm</strong>
</v-flex>
<v-flex>
<strong>New Icon</strong>
<div class="caption">Mobile App</div>
</v-flex>
</v-layout>
</v-timeline-item>
<v-timeline-item color="teal lighten-3" small>
<v-layout wrap pt-3>
<v-flex xs3>
<strong>3-4pm</strong>
</v-flex>
<v-flex>
<strong>Design Stand Up</strong>
<div class="caption mb-2">Hangouts</div>
<v-avatar>
<v-img
src="https://avataaars.io/?avatarStyle=Circle&topType=LongHairFrida&accessoriesType=Kurt&hairColor=Red&facialHairType=BeardLight&facialHairColor=BrownDark&clotheType=GraphicShirt&clotheColor=Gray01&graphicType=Skull&eyeType=Wink&eyebrowType=RaisedExcitedNatural&mouthType=Disbelief&skinColor=Brown"
></v-img>
</v-avatar>
<v-avatar>
<v-img
src="https://avataaars.io/?avatarStyle=Circle&topType=ShortHairFrizzle&accessoriesType=Prescription02&hairColor=Black&facialHairType=MoustacheMagnum&facialHairColor=BrownDark&clotheType=BlazerSweater&clotheColor=Black&eyeType=Default&eyebrowType=FlatNatural&mouthType=Default&skinColor=Tanned"
></v-img>
</v-avatar>
<v-avatar>
<v-img
src="https://avataaars.io/?avatarStyle=Circle&topType=LongHairMiaWallace&accessoriesType=Sunglasses&hairColor=BlondeGolden&facialHairType=Blank&clotheType=BlazerSweater&eyeType=Surprised&eyebrowType=RaisedExcited&mouthType=Smile&skinColor=Pale"
></v-img>
</v-avatar>
</v-flex>
</v-layout>
</v-timeline-item>
<v-timeline-item color="pink" small>
<v-layout pt-3>
<v-flex xs3>
<strong>12pm</strong>
</v-flex>
<v-flex>
<strong>Lunch break</strong>
</v-flex>
</v-layout>
</v-timeline-item>
<v-timeline-item color="teal lighten-3" small>
<v-layout pt-3>
<v-flex xs3>
<strong>9-11am</strong>
</v-flex>
<v-flex>
<strong>Finish Home Screen</strong>
<div class="caption">Web App</div>
</v-flex>
</v-layout>
</v-timeline-item>
</v-timeline>
</v-card-text>
</div>
</template>
<script>
......
canapGEST/Site/src/components/application/applicationTitle.vue
+ 1
− 1
View file @ 7783eba8
......@@ -3,7 +3,7 @@
<v-toolbar>
<v-toolbar-title>
Candidature (#{{$route.params.id}})
<small>- le {{$store.state.moduleApplications.currentApplication.application_data.personal_data.applicant_application_date}}</small>
<small>- le {{$store.getters['moduleApplications/getFormatedApplicationDate']}}</small>
</v-toolbar-title>
<v-spacer></v-spacer>
<v-rating
......
canapGEST/Site/src/components/application/sheets/filesDataSheet.vue
+ 0
− 7
View file @ 7783eba8
......@@ -5,14 +5,7 @@
<h4>Annexes</h4>
</v-card-title>
<v-divider></v-divider>
<v-list dense>
<!-- <v-list-tile-content>Fichier</v-list-tile-content> -->
<!-- <v-list-tile-content class="align-end">
<a @click="getFile(file.file_id)">
<u>{{ file.file_name }}</u>
</a>
</v-list-tile-content>-->
<v-container fluid>
<v-layout row wrap>
<v-flex
......
canapGEST/Site/src/store/modules/applications/getters.js
+ 13
− 3
View file @ 7783eba8
export function getFilteredApplications (state) {
export function getFilteredApplications(state) {
if (!state.filters.selectedJob && !state.filters.selectedStatus) {
return state.applications
} else if (state.filters.selectedJob && !state.filters.selectedStatus) {
......@@ -10,6 +10,16 @@ export function getFilteredApplications (state) {
}
}
export function getFormatedData (state) {
export function getFormatedApplicationDate(state) {
let dateTimeParts = state.currentApplication.application_data.personal_data.applicant_application_date.split(/[- :]/)
dateTimeParts[1]--
let date = new Date(...dateTimeParts)
return date.getDate() + '/' + (date.getMonth() + 1) + '/' + date.getFullYear() + ' à ' + date.getHours() + ':' + date.getMinutes()
}
export function getFormatedApplicationUpdateDate(state) {
let dateTimeParts = state.currentApplication.application_data.personal_data.applicant_application_updated_date.split(/[- :]/)
dateTimeParts[1]--
let date = new Date(...dateTimeParts)
return date.getDate() + '/' + (date.getMonth() + 1) + '/' + date.getFullYear() + ' à ' + date.getHours() + ':' + date.getMinutes()
}
\ No newline at end of file
canapGEST/Site/src/views/ApplicationView.vue
+ 9
− 104
View file @ 7783eba8
......@@ -4,6 +4,14 @@
<v-flex d-flex>
<ApplicationTitle></ApplicationTitle>
</v-flex>
<v-alert
outline
:value="$store.state.moduleApplications.currentApplication.application_data.personal_data.applicant_application_updated_date"
type="info"
style="margin-bottom: 30px;"
>Cette candidature à été modifiée par son propriétaire le {{$store.getters['moduleApplications/getFormatedApplicationUpdateDate']}}</v-alert>
<v-layout row wrap>
<v-flex d-flex xs12 sm8>
<v-layout row wrap>
......@@ -33,110 +41,7 @@
</v-layout>
</v-flex>
<v-flex d-flex xs12 sm4>
<v-sheet class="d-flex">
<v-card>
<v-card-title>
<h4>Commentaires</h4>
<ApplicationComments/>
{{$store.state.moduleApplications.currentApplication.comments}}
</v-card-title>
<v-card dark flat>
<v-btn absolute bottom color="pink" right fab>
<v-icon>mdi-plus</v-icon>
</v-btn>
<v-card-title class="pa-2 purple lighten-3">
<v-btn icon>
<v-icon>mdi-menu</v-icon>
</v-btn>
<h3 class="title font-weight-light text-xs-center grow">Timeline</h3>
<v-avatar>
<v-img
src="https://avataaars.io/?avatarStyle=Circle&topType=LongHairStraight&accessoriesType=Blank&hairColor=BrownDark&facialHairType=Blank&clotheType=BlazerShirt&eyeType=Default&eyebrowType=Default&mouthType=Default&skinColor=Light"
></v-img>
</v-avatar>
</v-card-title>
<v-img
src="https://cdn.vuetifyjs.com/images/cards/forest.jpg"
gradient="to top, rgba(0,0,0,.44), rgba(0,0,0,.44)"
>
<v-container fill-height>
<v-layout align-center>
<strong class="display-4 font-weight-regular mr-4">8</strong>
<v-layout column justify-end>
<div class="headline font-weight-light">Monday</div>
<div class="text-uppercase font-weight-light">February 2015</div>
</v-layout>
</v-layout>
</v-container>
</v-img>
</v-card>
<v-card-text class="py-0">
<v-timeline align-top dense>
<v-timeline-item color="pink" small>
<v-layout pt-3>
<v-flex xs3>
<strong>5pm</strong>
</v-flex>
<v-flex>
<strong>New Icon</strong>
<div class="caption">Mobile App</div>
</v-flex>
</v-layout>
</v-timeline-item>
<v-timeline-item color="teal lighten-3" small>
<v-layout wrap pt-3>
<v-flex xs3>
<strong>3-4pm</strong>
</v-flex>
<v-flex>
<strong>Design Stand Up</strong>
<div class="caption mb-2">Hangouts</div>
<v-avatar>
<v-img
src="https://avataaars.io/?avatarStyle=Circle&topType=LongHairFrida&accessoriesType=Kurt&hairColor=Red&facialHairType=BeardLight&facialHairColor=BrownDark&clotheType=GraphicShirt&clotheColor=Gray01&graphicType=Skull&eyeType=Wink&eyebrowType=RaisedExcitedNatural&mouthType=Disbelief&skinColor=Brown"
></v-img>
</v-avatar>
<v-avatar>
<v-img
src="https://avataaars.io/?avatarStyle=Circle&topType=ShortHairFrizzle&accessoriesType=Prescription02&hairColor=Black&facialHairType=MoustacheMagnum&facialHairColor=BrownDark&clotheType=BlazerSweater&clotheColor=Black&eyeType=Default&eyebrowType=FlatNatural&mouthType=Default&skinColor=Tanned"
></v-img>
</v-avatar>
<v-avatar>
<v-img
src="https://avataaars.io/?avatarStyle=Circle&topType=LongHairMiaWallace&accessoriesType=Sunglasses&hairColor=BlondeGolden&facialHairType=Blank&clotheType=BlazerSweater&eyeType=Surprised&eyebrowType=RaisedExcited&mouthType=Smile&skinColor=Pale"
></v-img>
</v-avatar>
</v-flex>
</v-layout>
</v-timeline-item>
<v-timeline-item color="pink" small>
<v-layout pt-3>
<v-flex xs3>
<strong>12pm</strong>
</v-flex>
<v-flex>
<strong>Lunch break</strong>
</v-flex>
</v-layout>
</v-timeline-item>
<v-timeline-item color="teal lighten-3" small>
<v-layout pt-3>
<v-flex xs3>
<strong>9-11am</strong>
</v-flex>
<v-flex>
<strong>Finish Home Screen</strong>
<div class="caption">Web App</div>
</v-flex>
</v-layout>
</v-timeline-item>
</v-timeline>
</v-card-text>
</v-card>
</v-sheet>
<ApplicationComments/>
</v-flex>
</v-layout>
</v-container>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment