Página inicial Explorar Ajuda
Registrar Entrar
clovis
/
bdlg-planner-backend
1
0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Ver código fonte

fix UI and competences list in qestionnaire

tripeur 4 anos atrás
pai
7de973b97c
commit
b6eb716fdc
18 arquivos alterados com 16 adições e 14 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 3 1
      src/main/java/fr/jaquin/bdlg/planner/controller/ApiController.java
  2. 7 7
      src/main/java/fr/jaquin/bdlg/planner/persistence/QuestionnaireQuestion.java
  3. 1 1
      src/main/resources/static/admin/index.html
  4. 0 0
      src/main/resources/static/css/chunk-common.4665c26a.css
  5. 0 1
      src/main/resources/static/css/inscription.5d889718.css
  6. 1 0
      src/main/resources/static/css/inscription.d48af8b1.css
  7. 1 1
      src/main/resources/static/inscription/index.html
  8. 0 0
      src/main/resources/static/js/chunk-common.4b8b70d3.js
  9. 0 0
      src/main/resources/static/js/chunk-common.4b8b70d3.js.map
  10. 0 0
      src/main/resources/static/js/chunk-common.c3136881.js
  11. 0 0
      src/main/resources/static/js/chunk-common.c3136881.js.map
  12. 0 0
      src/main/resources/static/js/inscription.1846b7e6.js
  13. 0 0
      src/main/resources/static/js/inscription.1846b7e6.js.map
  14. 0 0
      src/main/resources/static/js/inscription.a75808b3.js
  15. 0 0
      src/main/resources/static/js/inscription.a75808b3.js.map
  16. 1 1
      src/main/resources/static/login.html
  17. 1 1
      src/main/resources/static/planner/index.html
  18. 1 1
      src/main/resources/static/planning/display/index.html

+ 3 - 1
src/main/java/fr/jaquin/bdlg/planner/controller/ApiController.java
Ver arquivo 

@@ -213,7 +213,9 @@ public class ApiController {
 
 
   @GetMapping("/questionnaire/{uuid}/questions")
 
   List<QuestionnaireQuestion> getQuestionnaireQuestions(@PathVariable String uuid) {
 
-    return repositoryQuestionnaireQuestion.findByEvtUuid(uuid);
 
+    List<QuestionnaireQuestion> output = repositoryQuestionnaireQuestion.findByEvtUuid(uuid);
 
+    output.forEach(q -> q.getCompetenceList().sort((a, b) -> Long.compare(a.getUid(), b.getUid())));
 
+    return output;
 
   }
 
 
   @PutMapping("/questionnaire/{evtUuid}/questions/{uuid}")

+ 7 - 7
src/main/java/fr/jaquin/bdlg/planner/persistence/QuestionnaireQuestion.java
Ver arquivo 

@@ -1,7 +1,7 @@
 
 package fr.jaquin.bdlg.planner.persistence;
 
 
-import java.util.HashSet;
 
-import java.util.Set;
 
+import java.util.ArrayList;
 
+import java.util.List;
 
 import javax.persistence.CascadeType;
 
 import javax.persistence.Column;
 
 import javax.persistence.Entity;
 
@@ -34,8 +34,8 @@ public class QuestionnaireQuestion {
 
 
   @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, mappedBy = "question",
 
       orphanRemoval = true)
 
-  private Set<QuestionnaireQuestionCompetence> competenceList =
 
-      new HashSet<QuestionnaireQuestionCompetence>();
 
+  private List<QuestionnaireQuestionCompetence> competenceList =
 
+      new ArrayList<QuestionnaireQuestionCompetence>();
 
 
   public QuestionnaireQuestion() {}
 
 
@@ -124,11 +124,11 @@ public class QuestionnaireQuestion {
 
     this._order = _order;
 
   }
 
 
-  public Set<QuestionnaireQuestionCompetence> getCompetenceList() {
 
-    return this.competenceList;
 
+  public List<QuestionnaireQuestionCompetence> getCompetenceList() {
 
+    return competenceList;
 
   }
 
 
-  public void setCompetenceList(Set<QuestionnaireQuestionCompetence> competenceList) {
 
+  public void setCompetenceList(List<QuestionnaireQuestionCompetence> competenceList) {
 
     this.competenceList = competenceList;
 
   }

+ 1 - 1
src/main/resources/static/admin/index.html
Ver arquivo 

@@ -1 +1 @@
 
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>BDLG planner - Admninistration</title><link href="/css/admin.e608b799.css" rel="preload" as="style"><link href="/css/chunk-common.ba3ec5db.css" rel="preload" as="style"><link href="/js/admin.51a3419c.js" rel="preload" as="script"><link href="/js/chunk-common.4b8b70d3.js" rel="preload" as="script"><link href="/js/chunk-vendors.7c75c0d0.js" rel="preload" as="script"><link href="/css/chunk-common.ba3ec5db.css" rel="stylesheet"><link href="/css/admin.e608b799.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but BDLG planner - Admninistration doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.7c75c0d0.js"></script><script src="/js/chunk-common.4b8b70d3.js"></script><script src="/js/admin.51a3419c.js"></script></body></html>
 
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>BDLG planner - Admninistration</title><link href="/css/admin.e608b799.css" rel="preload" as="style"><link href="/css/chunk-common.4665c26a.css" rel="preload" as="style"><link href="/js/admin.51a3419c.js" rel="preload" as="script"><link href="/js/chunk-common.c3136881.js" rel="preload" as="script"><link href="/js/chunk-vendors.7c75c0d0.js" rel="preload" as="script"><link href="/css/chunk-common.4665c26a.css" rel="stylesheet"><link href="/css/admin.e608b799.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but BDLG planner - Admninistration doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.7c75c0d0.js"></script><script src="/js/chunk-common.c3136881.js"></script><script src="/js/admin.51a3419c.js"></script></body></html>

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
src/main/resources/static/css/chunk-common.4665c26a.css


+ 0 - 1
src/main/resources/static/css/inscription.5d889718.css
Ver arquivo 

@@ -1 +0,0 @@
 
-.inscription-container[data-v-d40cc690]{max-width:600px;padding:8px}

+ 1 - 0
src/main/resources/static/css/inscription.d48af8b1.css
Ver arquivo 

@@ -0,0 +1 @@
 
+.inscription-container[data-v-7c0a8920]{max-width:600px;padding:8px}

+ 1 - 1
src/main/resources/static/inscription/index.html
Ver arquivo 

@@ -1 +1 @@
 
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>BDLG inscription bénévole</title><link href="/css/chunk-common.ba3ec5db.css" rel="preload" as="style"><link href="/css/inscription.5d889718.css" rel="preload" as="style"><link href="/js/chunk-common.4b8b70d3.js" rel="preload" as="script"><link href="/js/chunk-vendors.7c75c0d0.js" rel="preload" as="script"><link href="/js/inscription.a75808b3.js" rel="preload" as="script"><link href="/css/chunk-common.ba3ec5db.css" rel="stylesheet"><link href="/css/inscription.5d889718.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but BDLG inscription bénévole doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.7c75c0d0.js"></script><script src="/js/chunk-common.4b8b70d3.js"></script><script src="/js/inscription.a75808b3.js"></script></body></html>
 
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>BDLG inscription bénévole</title><link href="/css/chunk-common.4665c26a.css" rel="preload" as="style"><link href="/css/inscription.d48af8b1.css" rel="preload" as="style"><link href="/js/chunk-common.c3136881.js" rel="preload" as="script"><link href="/js/chunk-vendors.7c75c0d0.js" rel="preload" as="script"><link href="/js/inscription.1846b7e6.js" rel="preload" as="script"><link href="/css/chunk-common.4665c26a.css" rel="stylesheet"><link href="/css/inscription.d48af8b1.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but BDLG inscription bénévole doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.7c75c0d0.js"></script><script src="/js/chunk-common.c3136881.js"></script><script src="/js/inscription.1846b7e6.js"></script></body></html>

Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
src/main/resources/static/js/chunk-common.4b8b70d3.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
src/main/resources/static/js/chunk-common.4b8b70d3.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
src/main/resources/static/js/chunk-common.c3136881.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
src/main/resources/static/js/chunk-common.c3136881.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
src/main/resources/static/js/inscription.1846b7e6.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
src/main/resources/static/js/inscription.1846b7e6.js.map


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
src/main/resources/static/js/inscription.a75808b3.js


Diferenças do arquivo suprimidas por serem muito extensas
+ 0 - 0
src/main/resources/static/js/inscription.a75808b3.js.map


+ 1 - 1
src/main/resources/static/login.html
Ver arquivo 

@@ -1 +1 @@
 
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>BDLG planner - Connexion</title><link href="/css/chunk-common.ba3ec5db.css" rel="preload" as="style"><link href="/css/login.66cd4ace.css" rel="preload" as="style"><link href="/js/chunk-common.4b8b70d3.js" rel="preload" as="script"><link href="/js/chunk-vendors.7c75c0d0.js" rel="preload" as="script"><link href="/js/login.490da1e9.js" rel="preload" as="script"><link href="/css/chunk-common.ba3ec5db.css" rel="stylesheet"><link href="/css/login.66cd4ace.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but BDLG planner - Connexion doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.7c75c0d0.js"></script><script src="/js/chunk-common.4b8b70d3.js"></script><script src="/js/login.490da1e9.js"></script></body></html>
 
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>BDLG planner - Connexion</title><link href="/css/chunk-common.4665c26a.css" rel="preload" as="style"><link href="/css/login.66cd4ace.css" rel="preload" as="style"><link href="/js/chunk-common.c3136881.js" rel="preload" as="script"><link href="/js/chunk-vendors.7c75c0d0.js" rel="preload" as="script"><link href="/js/login.490da1e9.js" rel="preload" as="script"><link href="/css/chunk-common.4665c26a.css" rel="stylesheet"><link href="/css/login.66cd4ace.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but BDLG planner - Connexion doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.7c75c0d0.js"></script><script src="/js/chunk-common.c3136881.js"></script><script src="/js/login.490da1e9.js"></script></body></html>

+ 1 - 1
src/main/resources/static/planner/index.html
Ver arquivo 

@@ -1 +1 @@
 
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>BDLG planner</title><link href="/css/chunk-common.ba3ec5db.css" rel="preload" as="style"><link href="/css/index.cc9ae3fd.css" rel="preload" as="style"><link href="/js/chunk-common.4b8b70d3.js" rel="preload" as="script"><link href="/js/chunk-vendors.7c75c0d0.js" rel="preload" as="script"><link href="/js/index.84157bd3.js" rel="preload" as="script"><link href="/css/chunk-common.ba3ec5db.css" rel="stylesheet"><link href="/css/index.cc9ae3fd.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but BDLG planner doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.7c75c0d0.js"></script><script src="/js/chunk-common.4b8b70d3.js"></script><script src="/js/index.84157bd3.js"></script></body></html>
 
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>BDLG planner</title><link href="/css/chunk-common.4665c26a.css" rel="preload" as="style"><link href="/css/index.cc9ae3fd.css" rel="preload" as="style"><link href="/js/chunk-common.c3136881.js" rel="preload" as="script"><link href="/js/chunk-vendors.7c75c0d0.js" rel="preload" as="script"><link href="/js/index.84157bd3.js" rel="preload" as="script"><link href="/css/chunk-common.4665c26a.css" rel="stylesheet"><link href="/css/index.cc9ae3fd.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but BDLG planner doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.7c75c0d0.js"></script><script src="/js/chunk-common.c3136881.js"></script><script src="/js/index.84157bd3.js"></script></body></html>

+ 1 - 1
src/main/resources/static/planning/display/index.html
Ver arquivo 

@@ -1 +1 @@
 
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>BDLG planner - Visualisation</title><link href="/css/chunk-common.ba3ec5db.css" rel="preload" as="style"><link href="/css/display.a5f74431.css" rel="preload" as="style"><link href="/js/chunk-common.4b8b70d3.js" rel="preload" as="script"><link href="/js/chunk-vendors.7c75c0d0.js" rel="preload" as="script"><link href="/js/display.3711331c.js" rel="preload" as="script"><link href="/css/chunk-common.ba3ec5db.css" rel="stylesheet"><link href="/css/display.a5f74431.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but BDLG planner - Visualisation doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.7c75c0d0.js"></script><script src="/js/chunk-common.4b8b70d3.js"></script><script src="/js/display.3711331c.js"></script></body></html>
 
+<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>BDLG planner - Visualisation</title><link href="/css/chunk-common.4665c26a.css" rel="preload" as="style"><link href="/css/display.a5f74431.css" rel="preload" as="style"><link href="/js/chunk-common.c3136881.js" rel="preload" as="script"><link href="/js/chunk-vendors.7c75c0d0.js" rel="preload" as="script"><link href="/js/display.3711331c.js" rel="preload" as="script"><link href="/css/chunk-common.4665c26a.css" rel="stylesheet"><link href="/css/display.a5f74431.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but BDLG planner - Visualisation doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.7c75c0d0.js"></script><script src="/js/chunk-common.c3136881.js"></script><script src="/js/display.3711331c.js"></script></body></html>

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff