Ajout d'un champ permettant de rédiger le rapport de vote #28

Manually merged
wpetit merged 2 commits from feature/vote-report into develop 2020-10-12 13:29:29 +02:00
2 changed files with 17 additions and 0 deletions
Showing only changes of commit e5152aa652 - Show all commits

View File

@ -172,6 +172,16 @@ func NewDefault() *Config {
{{ end }} {{ end }}
{{- end}} {{- end}}
{{- with .Voted }}
Récemment votés
---------------
{{range . -}}
- "{{ .Title }}" - {{ $root.BaseURL }}/decisions/{{ .ID }} - voté le {{ .VotedAt.Format "02/01/2006" }}
{{ end }}
{{- end}}
{{- with .NewDecisionSupportFiles }} {{- with .NewDecisionSupportFiles }}
Nouveaux dossiers d'aide à la décision Nouveaux dossiers d'aide à la décision

View File

@ -73,6 +73,7 @@ func (t *Newsletter) Run() {
newWorkgroups := make([]*model.Workgroup, 0) newWorkgroups := make([]*model.Workgroup, 0)
newDecisionSupportFiles := make([]*model.DecisionSupportFile, 0) newDecisionSupportFiles := make([]*model.DecisionSupportFile, 0)
readyToVote := make([]*model.DecisionSupportFile, 0) readyToVote := make([]*model.DecisionSupportFile, 0)
voted := make([]*model.DecisionSupportFile, 0)
workgroupRepo := model.NewWorkgroupRepository(db) workgroupRepo := model.NewWorkgroupRepository(db)
dsfRepo := model.NewDSFRepository(db) dsfRepo := model.NewDSFRepository(db)
@ -122,6 +123,10 @@ func (t *Newsletter) Run() {
if dsf.Status == model.StatusReady { if dsf.Status == model.StatusReady {
readyToVote = append(readyToVote, dsf) readyToVote = append(readyToVote, dsf)
} }
if dsf.Status == model.StatusVoted {
voted = append(voted, dsf)
}
} }
} }
@ -147,6 +152,7 @@ func (t *Newsletter) Run() {
NewWorkgroups []*model.Workgroup NewWorkgroups []*model.Workgroup
NewDecisionSupportFiles []*model.DecisionSupportFile NewDecisionSupportFiles []*model.DecisionSupportFile
ReadyToVote []*model.DecisionSupportFile ReadyToVote []*model.DecisionSupportFile
Voted []*model.DecisionSupportFile
BaseURL string BaseURL string
From time.Time From time.Time
To time.Time To time.Time
@ -157,6 +163,7 @@ func (t *Newsletter) Run() {
NewWorkgroups: newWorkgroups, NewWorkgroups: newWorkgroups,
NewDecisionSupportFiles: newDecisionSupportFiles, NewDecisionSupportFiles: newDecisionSupportFiles,
ReadyToVote: readyToVote, ReadyToVote: readyToVote,
Voted: voted,
From: from.Local(), From: from.Local(),
To: to.Local(), To: to.Local(),
HasEvents: hasEvents, HasEvents: hasEvents,