le-village-du-possible/ArenMg
2
0
Fork 0
mirror of https://github.com/ArenMg/aren.git synced 2024-11-16 05:30:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8 from Arimihanta/main

Browse source 
Regler problème même vote sur vote majoritaire
This commit is contained in:
ArenMg 2021-07-16 18:46:52 +03:00 committed by GitHub
commit 1af9d864dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/fr/lirmm/aren/ws/rest/VMThemeRESTFacade.java
View file

@ -106,7 +106,7 @@ public class VMThemeRESTFacade extends AbstractRESTFacade<VMTheme>{
choicesNotVoted.add(choice) ; choicesNotVoted.add(choice) ;
} }
} }
VMChoice newChoices[]=new VMChoice[choices.length] ; HashSet<VMChoice> newChoices = new HashSet<>();
if(!proposalTallyInterfaces.isEmpty()){ if(!proposalTallyInterfaces.isEmpty()){
ProposalTallyInterface []proposalTallyInterfacesArray=new ProposalTallyInterface[proposalTallyInterfaces.size()] ; ProposalTallyInterface []proposalTallyInterfacesArray=new ProposalTallyInterface[proposalTallyInterfaces.size()] ;
for(int i=0 ; i<proposalTallyInterfaces.size() ; i++){ for(int i=0 ; i<proposalTallyInterfaces.size() ; i++){
@ -121,24 +121,16 @@ public class VMThemeRESTFacade extends AbstractRESTFacade<VMTheme>{
for(ProposalResultInterface item : result.getProposalResults()){ for(ProposalResultInterface item : result.getProposalResults()){
VMChoice vmChoice=(VMChoice) choices[index] ; VMChoice vmChoice=(VMChoice) choices[index] ;
vmChoice.setRank(item.getRank()); vmChoice.setRank(item.getRank());
newChoices[item.getRank()-1]=vmChoice ; newChoices.add(vmChoice) ;
System.out.println(item.getRank()+" - "+newChoices[item.getRank()-1].getTitle());
index++ ; index++ ;
} }
} }
for(int i=0 ; i<choicesNotVoted.size() ; i++){ for(int i=0 ; i<choicesNotVoted.size() ; i++){
VMChoice vmChoice=choicesNotVoted.get(i) ; VMChoice vmChoice=choicesNotVoted.get(i) ;
vmChoice.setRank(newChoices.length-i); vmChoice.setRank(newChoices.size()-i);
newChoices[newChoices.length-(i+1)]= vmChoice ; newChoices.add(vmChoice) ;
} }
HashSet<VMChoice> setChoices = new HashSet<>(); theme.setChoices(newChoices);
System.out.println("Rang : ") ;
for(int i=0 ; i<newChoices.length ; i++){
System.out.println(i+" - "+newChoices[i].getTitle());
setChoices.add(newChoices[i]) ;
}
theme.setChoices(setChoices);
} }
} }