tykayn/funky-framadate-front
1
1
Fork 1
mirror of https://framagit.org/framasoft/framadate/funky-framadate-front.git synced 2023-08-25 13:53:14 +02:00
Code Issues Projects Releases Wiki Activity

visual sections for date selection

Browse Source
This commit is contained in:
Tykayn 2021-02-09 11:27:01 +01:00 committed by tykayn
parent 2edb828aa3
commit de679721d1
4 changed files with 199 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/features/administration/administration.module.ts
View File

@ -17,6 +17,7 @@ import { KindSelectComponent } from './form/kind-select/kind-select.component';
import { BaseConfigComponent } from './form/base-config/base-config.component'; import { BaseConfigComponent } from './form/base-config/base-config.component';
import { AdvancedConfigComponent } from './form/advanced-config/advanced-config.component'; import { AdvancedConfigComponent } from './form/advanced-config/advanced-config.component';
import { CalendarModule } from 'primeng'; import { CalendarModule } from 'primeng';
import { DragDropModule } from '@angular/cdk/drag-drop';
@NgModule({ @NgModule({
declarations: [ declarations: [
@ -40,6 +41,7 @@ import { CalendarModule } from 'primeng';
FormsModule, FormsModule,
TranslateModule.forChild({ extend: true }), TranslateModule.forChild({ extend: true }),
DateValueAccessorModule, DateValueAccessorModule,
DragDropModule,
], ],
}) })
export class AdministrationModule {} export class AdministrationModule {}

158
src/app/features/administration/form/date-select/date-select.component.html
View File

@ -1,70 +1,68 @@
<div class="date-selection"> <div class="date-selection">
<!-- <form [formGroup]="form">--> <!-- <form [formGroup]="form">-->
<!-- interval--> <!-- interval-->
<button
<!-- <section *ngIf="showDateInterval" class="date-interval form-row">--> (click)="showDateInterval = !showDateInterval"
<!-- <button--> [ngClass]="{ active: showDateInterval }"
<!-- (click)="showDateInterval = !showDateInterval"--> class="btn btn--primary"
<!-- [ngClass]="{ active: showDateInterval }"--> id="toggle_interval_button"
<!-- class="btn btn&#45;&#45;primary"--> >
<!-- id="toggle_interval_button"--> <i class="fa fa-clock-o" aria-hidden="true"></i>
<!-- >--> <span>
<!-- <i class="fa fa-clock-o" aria-hidden="true"></i>--> {{ 'dates.add_interval' | translate }}
<!-- {{ 'dates.add_interval' | translate }}--> </span>
<!-- </button>--> </button>
<!-- <h2>{{ 'dates.add_interval' | translate }}</h2>--> <fieldset *ngIf="showDateInterval" class="date-interval form-row is-boxed">
<!-- <div class="columns">--> <h2>{{ 'dates.add_interval' | translate }}</h2>
<!-- <div class="column">--> <div class="columns">
<!-- {{ 'dates.interval_propose' | translate }}--> <div class="column">
<!-- </div>--> {{ 'dates.interval_propose' | translate }}
<!-- <div class="column">--> </div>
<!-- <label for="start_interval" class="hidden">start</label>--> <div class="column">
<!-- <input id="start_interval" (change)="countDays()" formControlName="startDateInterval" type="date" />--> <label for="start_interval" class="hidden">start</label>
<!-- </div>--> <input id="start_interval" (change)="countDays()" formControlName="startDateInterval" type="date" />
<!-- </div>--> </div>
<!-- <div class="columns">--> </div>
<!-- <div class="column">--> <div class="columns">
<!-- {{ 'dates.interval_span' | translate }}--> <div class="column">
<!-- </div>--> {{ 'dates.interval_span' | translate }}
<!-- <div class="column">--> </div>
<!-- <label for="end_interval" class="hidden">end</label>--> <div class="column">
<!-- <input id="end_interval" formControlName="endDateInterval" type="date" />--> <label for="end_interval" class="hidden">end</label>
<!-- </div>--> <input id="end_interval" formControlName="endDateInterval" type="date" />
<!-- </div>--> </div>
<!-- <button (click)="addIntervalOfDates()" class="btn btn-block btn&#45;&#45;primary">--> </div>
<!-- <i class="fa fa-plus" aria-hidden="true"></i>--> <button (click)="addIntervalOfDates()" class="btn btn-block btn--primary">
<!-- {{ 'dates.interval_button' | translate }}--> <i class="fa fa-plus" aria-hidden="true"></i>
<!-- {{ intervalDays }}--> {{ 'dates.interval_button' | translate }}
<!-- {{ 'dates.interval_button_dates' | translate }}--> {{ intervalDays }}
<!-- </button>--> {{ 'dates.interval_button_dates' | translate }}
<!-- </section>--> </button>
</fieldset>
<!-- </form>--> <!-- </form>-->
<div class="dates-list"> <div class="dates-list">
<div class="title"> <div class="range-container is-boxed">
<span class="count-dates"> <div class="actions columns">
{{ timeList.length }} <div class="column">
</span>
<span class="count-dates-txt">
{{ 'dates.count_time' | translate }}
(pour chaque jour)
</span>
</div>
<div class="actions">
<button <button
class="btn" class="btn"
[class.is-primary]="form.value.configuration.hasSeveralHours" [class.is-primary]="form.value.configuration.hasSeveralHours"
(click)=" (click)="
form.patchValue({ configuration: { hasSeveralHours: !form.value.configuration.hasSeveralHours } }) form.patchValue({
configuration: { hasSeveralHours: !form.value.configuration.hasSeveralHours }
})
" "
> >
<i class="fa fa-clock-o"></i> <i class="fa fa-clock-o"></i>
<span> horaires différentes à chaque jour </span> <span> horaires différentes à chaque jour </span>
</button> </button>
</div>
<div class="column">
<button <button
(click)="addTime()" (click)="addTime()"
*ngIf="!form.value.configuration.hasSeveralHours" *ngIf="form.value.configuration.hasSeveralHours"
class="btn btn--primary" class="btn btn--primary"
id="add_time_button" id="add_time_button"
> >
@ -75,7 +73,7 @@
</button> </button>
<button <button
(click)="removeAllTimes()" (click)="removeAllTimes()"
*ngIf="'false' === allowSeveralHours" *ngIf="form.value.configuration.hasSeveralHours"
class="btn btn--warning" class="btn btn--warning"
id="remove_time_button" id="remove_time_button"
> >
@ -86,7 +84,7 @@
</button> </button>
<button <button
(click)="resetTimes()" (click)="resetTimes()"
*ngIf="'false' === allowSeveralHours" *ngIf="form.value.configuration.hasSeveralHours"
class="btn btn--warning" class="btn btn--warning"
id="reset_time_button" id="reset_time_button"
> >
@ -96,26 +94,40 @@
</span> </span>
</button> </button>
</div> </div>
</div>
<div class="range-time" *ngIf="form.value.configuration.hasSeveralHours">
<div class="title">
<span class="count-dates">
{{ timeList.length }}
</span>
<span class="count-dates-txt">
{{ 'dates.count_time' | translate }}
(pour chaque jour)
</span>
</div>
<div *ngIf="!form.value.configuration.hasSeveralHours" class="identical-dates">
<div cdkDropList class="example-list" (cdkDropListDropped)="drop($event)">
<div *ngFor="let time of timeList; index as id" class="time-choice" cdkDrag>
<label for="timeChoices_{{ id }}">
<i class="fa fa-clock-o" aria-hidden="true"></i>
</label>
<input
[(ngModel)]="time.literal"
name="timeChoices_{{ id }}"
type="text"
id="timeChoices_{{ id }}"
/>
<button (click)="time.timeList.splice(id, 1)" class="btn btn-warning">
<i class="fa fa-times" aria-hidden="true"></i>
</button>
</div>
</div>
</div>
</div>
</div>
<!-- <div *ngIf="'false' === allowSeveralHours" class="identical-dates">-->
<!-- <div cdkDropList class="example-list" (cdkDropListDropped)="drop($event)">-->
<!-- <div *ngFor="let time of timeList; index as id" class="time-choice" cdkDrag>-->
<!-- <label for="timeChoices_{{ id }}">-->
<!-- <i class="fa fa-clock-o" aria-hidden="true"></i>-->
<!-- </label>-->
<!-- <input-->
<!-- [(ngModel)]="time.literal"-->
<!-- name="timeChoices_{{ id }}"-->
<!-- type="text"-->
<!-- id="timeChoices_{{ id }}"-->
<!-- />-->
<!-- <button (click)="time.timeList.splice(id, 1)" class="btn btn-warning">-->
<!-- <i class="fa fa-times" aria-hidden="true"></i>-->
<!-- </button>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<hr /> <hr />
<div class="main-box is-boxed">
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
<!-- ajouter une date--> <!-- ajouter une date-->
@ -135,6 +147,7 @@
<div class="columns"> <div class="columns">
<div class="column"> <div class="column">
<h2>Dates</h2>
<div *ngFor="let choice of dateList; index as id" class="date-choice"> <div *ngFor="let choice of dateList; index as id" class="date-choice">
{{ id }}) {{ id }})
<input <input
@ -149,12 +162,14 @@
</button> </button>
<button <button
(click)="addTimeToDate(choice, id)" (click)="addTimeToDate(choice, id)"
*ngIf="'true' === allowSeveralHours" *ngIf="form.value.configuration.hasSeveralHours"
class="btn btn--primary" class="btn btn--primary"
> >
{{ 'dates.add_time' | translate }} {{ 'dates.add_time' | translate }}
</button> </button>
<div *ngIf="'true' === allowSeveralHours" class="several-times"> <div *ngIf="form.value.configuration.hasSeveralHours" class="several-times">
plage horaire distincte
<br />
<div *ngFor="let timeItem of choice.timeList; index as idTime" class="time-choice"> <div *ngFor="let timeItem of choice.timeList; index as idTime" class="time-choice">
<input <input
[(ngModel)]="timeItem.literal" [(ngModel)]="timeItem.literal"
@ -199,3 +214,4 @@
</div> </div>
</div> </div>
</div> </div>
</div>

5
src/app/features/administration/form/date-select/date-select.component.scss
View File

@ -5,4 +5,9 @@
.btn + .btn { .btn + .btn {
margin-left: 1em; margin-left: 1em;
} }
.is-boxed {
border: 1px solid #ddd;
padding: 1em;
margin: 1em 0;
}
} }

2
src/app/features/administration/form/form.component.ts
View File

@ -83,7 +83,7 @@ export class FormComponent implements OnInit {
allowComments: [true, [Validators.required]], allowComments: [true, [Validators.required]],
password: [this.uuidService.getUUID(), [Validators.required]], password: [this.uuidService.getUUID(), [Validators.required]],
dateCreated: [creationDate, [Validators.required]], dateCreated: [creationDate, [Validators.required]],
hasSeveralHours: [false, [Validators.required]], hasSeveralHours: [true, [Validators.required]],
hasMaxCountOfAnswers: [true, [Validators.required, Validators.min(1)]], hasMaxCountOfAnswers: [true, [Validators.required, Validators.min(1)]],
}), }),
startDateInterval: ['', [Validators.required]], startDateInterval: ['', [Validators.required]],