diff --git a/canapGEST/Documentation/journal_travail.xlsx b/canapGEST/Documentation/journal_travail.xlsx
index de82a2d454073c0a5d2ad07a903b1ed00346fb2f..604574c5601e9693565b076dd8835d759cc20e27 100644
Binary files a/canapGEST/Documentation/journal_travail.xlsx and b/canapGEST/Documentation/journal_travail.xlsx differ
diff --git a/canapGEST/Documentation/planification_etatActuel_NicolasCrausaz - Copy.xlsx b/canapGEST/Documentation/planification_etatActuel_NicolasCrausaz - Copy.xlsx
index 7e729d69271f31d3bc4d28d7a7944c5bb913cd2e..7ef7abb579ea8f66bc72c519fc8ec13230a708ea 100644
Binary files a/canapGEST/Documentation/planification_etatActuel_NicolasCrausaz - Copy.xlsx and b/canapGEST/Documentation/planification_etatActuel_NicolasCrausaz - Copy.xlsx differ
diff --git a/canapGEST/Site/src/components/application/applicationComments.vue b/canapGEST/Site/src/components/application/applicationComments.vue
index be3ba78b453dffad32148b0dae08aef081834bf9..fd09b2b4e549fab2bec707ed2364f22005706ee9 100644
--- a/canapGEST/Site/src/components/application/applicationComments.vue
+++ b/canapGEST/Site/src/components/application/applicationComments.vue
@@ -1,5 +1,102 @@
<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>
diff --git a/canapGEST/Site/src/components/application/applicationTitle.vue b/canapGEST/Site/src/components/application/applicationTitle.vue
index efffb84b1fa6a55abf5001034f7227ded14433d8..d4ef4b271a7cc0973291eedd23ac0922e872c077 100644
--- a/canapGEST/Site/src/components/application/applicationTitle.vue
+++ b/canapGEST/Site/src/components/application/applicationTitle.vue
@@ -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
diff --git a/canapGEST/Site/src/components/application/sheets/filesDataSheet.vue b/canapGEST/Site/src/components/application/sheets/filesDataSheet.vue
index 7c23a5a032e6c7696de28ec1b6679bd067d7c36e..b9c2232bb9404ec5404a0ea198a52776cc0041a0 100644
--- a/canapGEST/Site/src/components/application/sheets/filesDataSheet.vue
+++ b/canapGEST/Site/src/components/application/sheets/filesDataSheet.vue
@@ -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
diff --git a/canapGEST/Site/src/store/modules/applications/getters.js b/canapGEST/Site/src/store/modules/applications/getters.js
index 242dd6fd2ea2cd85c5d514f95158ea1e96fe156d..cc2663cec2b3e1a6b689675f92ec9605f9492972 100644
--- a/canapGEST/Site/src/store/modules/applications/getters.js
+++ b/canapGEST/Site/src/store/modules/applications/getters.js
@@ -1,4 +1,4 @@
-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
diff --git a/canapGEST/Site/src/views/ApplicationView.vue b/canapGEST/Site/src/views/ApplicationView.vue
index 72ff8792327e47136fcf8dd0464cec2d6f87510f..97aaf127c69d8b1c045ba56b379805b6048c6ebc 100644
--- a/canapGEST/Site/src/views/ApplicationView.vue
+++ b/canapGEST/Site/src/views/ApplicationView.vue
@@ -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>