Merge pull request #4 from carlosvasquez/master

FIX: Arreglando la perdida de página al momento de hacer login

Author: carlosvasquez

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.devdom</groupId>
     <artifactId>developer-influencer</artifactId>
-    <version>1.4</version>
+    <version>1.4.1</version>
     <packaging>war</packaging>
     <name>developer-influencer</name>
     <organization>

src/main/java/org/devdom/tracker/bean/AdministrationController.java

@@ -7,6 +7,8 @@
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
 import org.primefaces.util.Constants;
 
 /**
@@ -18,10 +20,23 @@
 public class AdministrationController implements Serializable {
 
     private static final long serialVersionUID = 1L;
-    private FacesContext facesContext = null;
-    private UIViewRoot uiRoot = null;
-    private String viewId = "";
+    private FacesContext facesContext;
+    private ExternalContext externalContext;    
+    private UIViewRoot uiRoot;
+    private String viewId;
+    private final HttpSession session;
 
+    public AdministrationController(HttpServletRequest request) {
+        session = request.getSession();
+    }
+
+    public AdministrationController(){
+        facesContext = FacesContext.getCurrentInstance();
+        externalContext = facesContext.getExternalContext();
+        session = (HttpSession) externalContext.getSession(true);
+        uiRoot = facesContext.getViewRoot();
+        viewId = uiRoot.getViewId();
+    }
     /**
      * Retornar la versión de JSF que se utiliza en el proyecto
      * @return 
@@ -45,7 +60,6 @@ public String getPrimefacesVersion(){
      * @return 
      */
     public String getActiveGroupId(){
-        ExternalContext externalContext = FacesContext.getCurrentInstance().getExternalContext();
         Map<String,String> request = externalContext.getRequestParameterMap();
         return (request.get("g")!=null)?request.get("g"):"";
 
@@ -56,9 +70,6 @@ public String getActiveGroupId(){
      * @return 
      */
     public int getActiveIndex(){
-        facesContext = FacesContext.getCurrentInstance();
-        uiRoot = facesContext.getViewRoot();
-        viewId = uiRoot.getViewId();
 
         switch(viewId){
             case "/groupTop20.xhtml" : return 0;
@@ -68,4 +79,24 @@ public int getActiveIndex(){
             default : return 0;
         }
     }
+    
+    public String getLastViewId(){
+        String lastViewID = (String) session.getAttribute("lastViewID");
+        String paramString = "";
+        String sep="?";
+        String[] localParams = {"pid","groupId","g"};
+
+        for(String param : localParams){
+            if(session.getAttribute(param)!=null){
+                paramString+=sep+param+"="+session.getAttribute(param);
+                sep="&";
+            }
+        }
+
+        return lastViewID+paramString;
+    }
+
+    public String getViewId(){
+        return viewId;
+    }
 }

src/main/java/org/devdom/tracker/bean/FacebookController.java

@@ -1,8 +1,10 @@
 package org.devdom.tracker.bean;
 
 import java.io.Serializable;
+import java.util.Map;
 import javax.faces.bean.ManagedBean;
 import javax.faces.bean.RequestScoped;
+import javax.faces.context.ExternalContext;
 import javax.faces.context.FacesContext;
 import javax.servlet.http.HttpSession;
 import org.devdom.tracker.model.dto.FacebookProfile;
@@ -17,16 +19,18 @@ public class FacebookController implements Serializable{
 
     private static final long serialVersionUID = 1L;
 
-    private FacesContext facesContext = FacesContext.getCurrentInstance();
-    private HttpSession session = (HttpSession) facesContext.getExternalContext().getSession(true);
+    private final FacesContext facesContext = FacesContext.getCurrentInstance();
+    private final ExternalContext externalContext = facesContext.getExternalContext();
+    private final HttpSession session = (HttpSession) externalContext.getSession(true);
+    private final Map<String, String> parameterMap = (Map<String, String>) externalContext.getRequestParameterMap();
 
+    private final AdministrationController admin = new AdministrationController();
     /**
      * return la imagen guardada en session por el usuario que se encuentra logueado
      * desde Facebook
      * @return 
      */
     public String getProfilePicture(){
-        session = (HttpSession) facesContext.getExternalContext().getSession(true);
         FacebookProfile profile = (FacebookProfile) session.getAttribute("profile");
         if(profile==null)
             return "";
@@ -40,7 +44,6 @@ public String getProfilePicture(){
      * @return 
      */
     public String getLoggedName(){
-        session = (HttpSession) facesContext.getExternalContext().getSession(true);
         FacebookProfile profile = (FacebookProfile) session.getAttribute("profile");
         if(profile==null)
             return "";
@@ -54,7 +57,6 @@ public String getLoggedName(){
      * @return 
      */
     public String getFacebookID(){
-        session = (HttpSession) facesContext.getExternalContext().getSession(true);
         FacebookProfile profile = (FacebookProfile) session.getAttribute("profile");
         if(profile==null)
             return "";
@@ -66,8 +68,17 @@ public String getFacebookID(){
      * @return 
      */
     public boolean isLogged(){
-        facesContext = FacesContext.getCurrentInstance();
-        session = (HttpSession) facesContext.getExternalContext().getSession(true);
+        boolean logged = session.getAttribute("facebook") != null;
+        if(!logged){
+            session.setAttribute("lastViewID",admin.getViewId());
+
+            if(parameterMap.containsKey("g"))
+                session.setAttribute("g", parameterMap.get("g"));
+
+            if(parameterMap.containsKey("pid"))
+                session.setAttribute("pid", parameterMap.get("pid"));
+
+        }
         return session.getAttribute("facebook") != null;
     }
 

src/main/java/org/devdom/tracker/bean/GraphController.java

@@ -139,6 +139,14 @@ public String getCommentsGraph(){
 "                                                                \"title\": \"C#.do\",\n" +
 "                                                                \"type\": \"smoothedLine\",\n" +
 "                                                                \"valueField\": \"column-634620033215438\"\n" +
+"                                                            },\n" +
+"                                                            {\n" +
+"                                                                \"balloonText\": \"[[value]] comentarios en [[category]] por [[title]]\",\n" +
+"                                                                \"bullet\": \"round\",\n" +
+"                                                                \"id\": \"179901595397349\",\n" +
+"                                                                \"title\": \"CDDV - Comunidad Dominicana de Desarrolladores de Videojuegos\",\n" +
+"                                                                \"type\": \"smoothedLine\",\n" +
+"                                                                \"valueField\": \"column-179901595397349\"\n" +
 "                                                            }\n" +
 "                                                    ],\n" +
 "                                                    \"guides\": [],\n" +
@@ -293,6 +301,14 @@ public String getPostsGraph(){
 "                                                                \"title\": \"C#.do\",\n" +
 "                                                                \"type\": \"smoothedLine\",\n" +
 "                                                                \"valueField\": \"column-634620033215438\"\n" +
+"                                                            },\n" +
+"                                                            {\n" +
+"                                                                \"balloonText\": \"[[value]] post en [[category]] por [[title]]\",\n" +
+"                                                                \"bullet\": \"round\",\n" +
+"                                                                \"id\": \"179901595397349\",\n" +
+"                                                                \"title\": \"CDDV - Comunidad Dominicana de Desarrolladores de Videojuegos\",\n" +
+"                                                                \"type\": \"smoothedLine\",\n" +
+"                                                                \"valueField\": \"column-179901595397349\"\n" +
 "                                                            }\n" +
 "                                                    ],\n" +
 "                                                    \"guides\": [],\n" +

src/main/webapp/groupDetails.xhtml

@@ -12,7 +12,7 @@
                     <c:choose>
                         <c:when test="${fb.logged}">
                             <ui:include src="template/groupMenu.xhtml"/>
-                            <div style="font-size:12px;padding:5px;padding-right:10px;padding-top:0px;">
+                            <div  style="width:1070px;font-size:12px;padding:5px;padding-right:10px;padding-top:0px;">
                                 <h3 style="padding:0px;">${group.activity.groupName}</h3>
                                 <div class="group-details">
                                     Detalles estadísticos del grupo <b>${group.activity.groupName}</b>
@@ -56,7 +56,7 @@
                                     border: 0 solid;
                                 }
                             </style>
-                            <div>
+                            <div style="width:1070px;">
                                 <div style="float:left;padding:3px;width:32%;height:500px;">
                                     <p:dataList style="height:500px;" id="top-interaction-most-liked-post" value="#{topInteraction.topMostLikedPostByGroupId}" var="interaction" type="definition">
                                         <f:facet name="header">Top de publicaciones con más likes</f:facet>