Merge pull request 'fix with the stats and translations' (#177) from Maxime/Clyde:master into master
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	
Reviewed-on: #177
This commit is contained in:
		@ -81,7 +81,7 @@ public class MockController {
 | 
			
		||||
 | 
			
		||||
        // user part
 | 
			
		||||
        User herobrine = new User("brine","hero","admin@admin.com","behind","ShadowsLand",new Date(0), null,Role.Admin,"admin");
 | 
			
		||||
        User joe = new User("Mama","Joe","student@student.com","roundabout","England",new Date(0), null,Role.Student,"student");
 | 
			
		||||
        User joe = new User("Piplo","Joe","student@student.com","roundabout","England",new Date(0), null,Role.Student,"student");
 | 
			
		||||
        User meh = new User("Polo","Marco","secretary@secretary.com","a Box","Monaco",new Date(0), null,Role.Secretary,"secretary");
 | 
			
		||||
        User joke = new User("Gaillard","Corentin","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,"teacher");
 | 
			
		||||
        User jojo = new User("Bridoux","Justin","teacher2@teacher2.com","lab","faculty",new Date(0), null,Role.Teacher,"teacher");
 | 
			
		||||
@ -168,13 +168,13 @@ public class MockController {
 | 
			
		||||
            Research jojoResearch = new Research("Graphs : Advanced Search Algorithms", output, new Date(0),
 | 
			
		||||
                    PaperType.Article, "test.pdf", null, "english",
 | 
			
		||||
                    Access.OpenSource, "IT", "This Article's title speaks for itself \n We'll discuss about advanced Graph search Algorithms",coAuthor);
 | 
			
		||||
            Research restrictedResearch = new Research("just another Name", output, new Date(1111111111),
 | 
			
		||||
                    PaperType.Article, "restricted", null, "english",
 | 
			
		||||
                    Access.Restricted, "Restricted", "This Article's title speaks for itself\n We'll discuss about advanced Graph search Algorithms", new HashSet<>());
 | 
			
		||||
            Research restrictedResearch = new Research("the great Constantinople war", output, new Date(1111111111),
 | 
			
		||||
                    PaperType.Article, "restricted", null, "Portuguese",
 | 
			
		||||
                    Access.Restricted, "history", "this is a summary", new HashSet<>());
 | 
			
		||||
 | 
			
		||||
            Research privateResearch = new Research("the great Potato War", output, new Date(),
 | 
			
		||||
                    PaperType.Article, "private", null, "english",
 | 
			
		||||
                    Access.Private, "private", "This Article's title speaks for itself\n We'll discuss about advanced Graph search Algorithms",null);
 | 
			
		||||
                    Access.Private, "agriculture", "my life is potato",null);
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
            researchesService.saveResearch(restrictedResearch);
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user