/*
 * Copyright (c) Région Hauts-de-France, Département 77, CGI, 2016.
 *
 * This file is part of OPEN ENT NG. OPEN ENT NG is a versatile ENT Project based on the JVM and ENT Core Project.
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as
 * published by the Free Software Foundation (version 3 of the License).
 * For the sake of explanation, any module that communicate over native
 * Web protocols, such as HTTP, with OPEN ENT NG is outside the scope of this
 * license and could be license under its own terms. This is merely considered
 * normal use of OPEN ENT NG, and does not fall under the heading of "covered work".
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 *
 */

package fr.openent;

import fr.wseduc.rs.ApiDoc;
import fr.wseduc.rs.Get;
import fr.wseduc.security.SecuredAction;
import org.entcore.common.controller.ControllerHelper;
import org.entcore.common.user.UserInfos;
import org.entcore.common.user.UserUtils;
import org.vertx.java.core.Handler;
import org.vertx.java.core.http.HttpServerRequest;

public class DisplayController extends ControllerHelper {

    public DisplayController(){
        pathPrefix = "";
    }

    @Get(Viescolaire.VSCO_PATHPREFIX)
    @ApiDoc("Get Vie Scolaire HTML view")
    @SecuredAction(value="Viescolaire.view")
    public void view(final HttpServerRequest request){
        UserUtils.getUserInfos(eb, request, new Handler<UserInfos>() {

            @Override
            public void handle(UserInfos user) {
                if(user.getType().equals("Teacher")) {
                    renderView(request, null, "vsco_teacher.html", null);
                }else if(user.getType().equals("Personnel")){
                    renderView(request, null, "vsco_personnel.html", null);
                }
            }
        });
    }
}
@@ -1084,128 +1084,8 @@
 er;%0A
-import org.entcore.common.user.UserInfos;%0Aimport org.entcore.common.user.UserUtils;%0Aimport org.vertx.java.core.Handler;%0A
 impo
@@ -1131,16 +1131,16 @@
 equest;%0A
+
 %0Apublic 
@@ -1359,17 +1359,19 @@
 on(value
-=
+ = 
 %22Viescol
@@ -1439,90 +1439,19 @@
 est)
-%7B%0A        UserUtils.getUserInfos(eb, request, new Handler%3CUserInfos%3E()
  %7B%0A
-%0A
         
     
@@ -1450,379 +1450,73 @@
     
-    @Override%0A            public void handle(UserInfos user) %7B%0A                if(user.getType().equals(%22Teacher%22)) %7B%0A                    renderView(request, null, %22vsco_teacher.html%22, null);%0A                %7Delse if(user.getType().equals(%22Personnel%22))%7B%0A                    renderView(request, null, %22vsco_personnel.html%22, null);%0A                %7D%0A            %7D%0A        %7D
+renderView(request, null, %22viescolaire/vsco_personnel.html%22, null
 );%0A 

Fix merge (split-presence & split)