Lot de travail : messages d'information pour les déclarants (fefc0f79) · Commits · open-source / oscar

public/css/app-beta.css

+1 −2

Original line number	Diff line number	Diff line
		@@ -7433,8 +7433,7 @@ form .help {
		border-bottom: solid thin rgba(0, 0, 0, 0.2);
		font-size: 1.4em; }
		.workpackage p {
		font-size: .9em;
		color: rgba(0, 0, 0, 0.5); }
		font-size: .9em; }
		.workpackage .workpackage-persons {
		display: block; }
		.workpackage .workpackage-persons .workpackage-person {

public/css/app.css

+1 −2

Original line number	Diff line number	Diff line
		@@ -7433,8 +7433,7 @@ form .help {
		border-bottom: solid thin rgba(0, 0, 0, 0.2);
		font-size: 1.4em; }
		.workpackage p {
		font-size: .9em;
		color: rgba(0, 0, 0, 0.5); }
		font-size: .9em; }
		.workpackage .workpackage-persons {
		display: block; }
		.workpackage .workpackage-persons .workpackage-person {

public/css/app.scss

+0 −1

Original line number	Diff line number	Diff line
		@@ -3004,7 +3004,6 @@ form {
		}
		p {
		font-size: .9em;
		color: rgba(0, 0, 0, .5);
		}
		.workpackage-persons {
		display: block;

public/js/components/build/workpackageperson.js

+1 −1

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ define(['exports', 'vue', 'vue-resource', 'LocalDB', 'bootbox', 'moment-timezone
		components: {
		workpackageperson: WorkpackagePerson
		},
		template: '<article class="workpackage">\n <form action="" @submit.prevent="handlerUpdateWorkPackage" v-if="mode == \'edit\'">\n <h4><span v-if="workpackage.id > 0">Modification du lot</span><span v-else>Nouveau lot</span> {{ formData.label }}</h4>\n <div class="form-group">\n <label for="">Intitul\xE9</label>\n <input type="text" placeholder="Intitul\xE9" v-model="formData.label" class="form-control" />\n </div>\n <div class="form-group">\n <label for="">Code</label>\n <p class="help">Le code est utilis\xE9 pour l\'affichage des cr\xE9neaux</p>\n <input type="text" placeholder="Intitul\xE9" v-model="formData.code" class="form-control" />\n </div>\n \n <div class="form-group" style="display: none">\n <label for="">P\xE9riode</label>\n <div class="row">\n <div class="col-md-6">\n du <input type="date" placeholder="D\xE9but" v-model="formData.start" class="form-control" />\n\n </div>\n <div class="col-md-6">\n du <input type="date" placeholder="Fin" v-model="formData.end" class="form-control" />\n </div>\n </div>\n </div>\n \n <div class="form-group">\n <label for="">Description</label>\n <textarea type="text" placeholder="Description" v-model="formData.description" class="form-control"></textarea>\n </div>\n <div class="buttons">\n <button type="submit" class="btn btn-default">Enregistrer</button>\n <button type="button" class="btn btn-default" @click="handlerCancelEdit">Annuler</button>\n </div>\n\n </form>\n <div v-if="mode == \'read\'">\n <h3>[{{ workpackage.code }}] {{ workpackage.label }}</h3>\n <small style="display: none">Du\n <strong v-if="!workpackage.start">d\xE9but de l\'activit\xE9</strong>\n <strong v-else>{{ workpackage.start }}</strong>\n au\n <strong v-if="!workpackage.end">fin de l\'activit\xE9</strong>\n <strong v-else>{{ workpackage.end }}</strong>\n </small>\n <p>{{ workpackage.description }}</p>\n\n <section class="workpackage-persons">\n <h4><i class="icon-calendar"></i>D\xE9clarants </h4>\n <workpackageperson v-for="person in workpackage.persons"\n :person="person"\n :editable="editable"\n @workpackagepersondelete="handlerDelete"\n @workpackagepersonupdate="handlerUpdate"></workpackageperson>\n </section>\n\n <div class="buttons" v-if="editable">\n <div class="btn-group">\n <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">\n Ajouter un d\xE9clarant <span class="caret"></span>\n </button>\n <ul class="dropdown-menu">\n <li v-for="person in persons"><a href="#" @click.prevent="$emit(\'addperson\', person.id, workpackage.id)">{{ person.displayname }}</a></li>\n </ul>\n </div>\n <a href="#" class="btn btn-default btn-xs" @click.prevent="handlerEditWorkPackage"><i class="icon-pencil"></i>Modifier</a>\n <a href="#" class="btn btn-default btn-xs" @click.prevent="handlerDeleteWorkPackage"><i class="icon-trash"></i>Supprimer</a>\n </div>\n </div>\n </article>',
		template: '<article class="workpackage">\n <form action="" @submit.prevent="handlerUpdateWorkPackage" v-if="mode == \'edit\'">\n \n <h4><span v-if="workpackage.id > 0">Modification du lot</span><span v-else>Nouveau lot</span> {{ formData.label }}</h4>\n \n <div class="form-group">\n <label for="">Code</label>\n <p class="text-danger">Le code est <strong>utilis\xE9 pour l\'affichage des cr\xE9neaux</strong> simplifi\xE9s, utilisez un code de pr\xE9f\xE9rence entre 3 et 5 caract\xE8res.</p>\n <input type="text" placeholder="CODE" v-model="formData.code" class="form-control" />\n </div>\n \n <div class="form-group">\n <label for="">Intitul\xE9</label>\n <input type="text" placeholder="Intitul\xE9" v-model="formData.label" class="form-control" />\n </div>\n \n <div class="form-group" style="display: none">\n <label for="">P\xE9riode</label>\n <div class="row">\n <div class="col-md-6">\n du <input type="date" placeholder="D\xE9but" v-model="formData.start" class="form-control" />\n\n </div>\n <div class="col-md-6">\n du <input type="date" placeholder="Fin" v-model="formData.end" class="form-control" />\n </div>\n </div>\n </div>\n \n <div class="form-group">\n <label for="">Description</label>\n <textarea type="text" placeholder="Description" v-model="formData.description" class="form-control"></textarea>\n </div>\n <div class="buttons">\n <button type="submit" class="btn btn-default">Enregistrer</button>\n <button type="button" class="btn btn-default" @click="handlerCancelEdit">Annuler</button>\n </div>\n\n </form>\n <div v-if="mode == \'read\'">\n <h3>[{{ workpackage.code }}] {{ workpackage.label }}</h3>\n <small style="display: none">Du\n <strong v-if="!workpackage.start">d\xE9but de l\'activit\xE9</strong>\n <strong v-else>{{ workpackage.start }}</strong>\n au\n <strong v-if="!workpackage.end">fin de l\'activit\xE9</strong>\n <strong v-else>{{ workpackage.end }}</strong>\n </small>\n <p>{{ workpackage.description }}</p>\n\n <section class="workpackage-persons">\n <h4><i class="icon-calendar"></i>D\xE9clarants </h4>\n <workpackageperson v-for="person in workpackage.persons"\n :person="person"\n :editable="editable"\n @workpackagepersondelete="handlerDelete"\n @workpackagepersonupdate="handlerUpdate"></workpackageperson>\n </section>\n\n <div class="buttons" v-if="editable && persons.length">\n <div class="btn-group">\n <button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">\n Ajouter un d\xE9clarant <span class="caret"></span>\n </button>\n <ul class="dropdown-menu">\n <li v-for="person in persons"><a href="#" @click.prevent="$emit(\'addperson\', person.id, workpackage.id)">{{ person.displayname }}</a></li>\n </ul>\n </div>\n <a href="#" class="btn btn-default btn-xs" @click.prevent="handlerEditWorkPackage"><i class="icon-pencil"></i>Modifier</a>\n <a href="#" class="btn btn-default btn-xs" @click.prevent="handlerDeleteWorkPackage"><i class="icon-trash"></i>Supprimer</a>\n </div>\n <div class="text-danger" v-if="persons.length <= 0">\n Vous n\'avez pas encore ajout\xE9 de membre \xE0 cette activit\xE9. <strong>Seul les membres d\'une activit\xE9 peuvent \xEAtre identifi\xE9s comme d\xE9clarant</strong>.\n </div>\n </div>\n </article>',
		data: function data() {
		return {
		mode: "read",

public/js/components/src/workpackageperson.js

+12 −6

Original line number	Diff line number	Diff line
		@@ -82,15 +82,18 @@ var Workpackage = {
		},
		template: `<article class="workpackage">
		<form action="" @submit.prevent="handlerUpdateWorkPackage" v-if="mode == 'edit'">

		<h4><span v-if="workpackage.id > 0">Modification du lot</span><span v-else>Nouveau lot</span> {{ formData.label }}</h4>

		<div class="form-group">
		<label for="">Intitulé</label>
		<input type="text" placeholder="Intitulé" v-model="formData.label" class="form-control" />
		<label for="">Code</label>
		<p class="text-danger">Le code est <strong>utilisé pour l'affichage des créneaux</strong> simplifiés, utilisez un code de préférence entre 3 et 5 caractères.</p>
		<input type="text" placeholder="CODE" v-model="formData.code" class="form-control" />
		</div>

		<div class="form-group">
		<label for="">Code</label>
		<p class="help">Le code est utilisé pour l'affichage des créneaux</p>
		<input type="text" placeholder="Intitulé" v-model="formData.code" class="form-control" />
		<label for="">Intitulé</label>
		<input type="text" placeholder="Intitulé" v-model="formData.label" class="form-control" />
		</div>

		<div class="form-group" style="display: none">
		@@ -136,7 +139,7 @@ var Workpackage = {
		@workpackagepersonupdate="handlerUpdate"></workpackageperson>
		</section>

		<div class="buttons" v-if="editable">
		<div class="buttons" v-if="editable && persons.length">
		<div class="btn-group">
		<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
		Ajouter un déclarant <span class="caret"></span>
		@@ -148,6 +151,9 @@ var Workpackage = {
		<a href="#" class="btn btn-default btn-xs" @click.prevent="handlerEditWorkPackage"><i class="icon-pencil"></i>Modifier</a>
		<a href="#" class="btn btn-default btn-xs" @click.prevent="handlerDeleteWorkPackage"><i class="icon-trash"></i>Supprimer</a>
		</div>
		<div class="text-danger" v-if="persons.length <= 0">
		Vous n'avez pas encore ajouté de membre à cette activité. <strong>Seul les membres d'une activité peuvent être identifiés comme déclarant</strong>.
		</div>
		</div>
		</article>`,
		data(){