Changeset 8724 for trunk/greenstone3-extensions/gsdl-as

Timestamp:

2004-12-02T16:20:11+13:00 (19 years ago)

Author:

schweer

Message:

wizard for creating subscriptions: saving state works

Location:

trunk/greenstone3-extensions/gsdl-as

Files:

• lib/templates/sub_collection.vm (added)
• lib/templates/sub_host.vm (added)
• lib/templates/sub_notification.vm (added)
• lib/templates/sub_type-details.vm (added)
• src/org/greenstone/gsdlas/AlertingService.java (modified) (7 diffs)
• web/default.css (modified) (1 diff)
• web/form.css (modified) (1 diff)
• web/subscribe.html (modified) (1 diff)

trunk/greenstone3-extensions/gsdl-as/src/org/greenstone/gsdlas/AlertingService.java

@@ -14 +14 @@
 import java.util.*;
 
+import javax.mail.Session;
 import javax.servlet.http.*;
 
@@ -38 +39 @@
         actions.add("login");
         actions.add("register");
+        actions.add("logout");
     }
     
@@ -99 +101 @@
             return "login.vm";
         }
-        // TODO handle wizard-style stuff 
-        // if "finish"
-        ProfileStore.getInstance().createSubscription(arguments);
-        return listSubscriptions(arguments, context);
-        // else show next page
+        if (arguments.containsKey("next_page") && arguments.get("next_page").equals("finish")) {
+            ProfileStore.getInstance().createSubscription(arguments);
+            return listSubscriptions(arguments, context);
+        } else {
+            return showSubscriptionWizardPage(arguments, context, true);
+        }
     }
 
@@ -117 +120 @@
     }
     
-    public String editSubscription(Map arguments, Context context) {
+    public String editSubscription(Map arguments, Context context) throws Exception {
         HttpSession session = ((HttpServletRequest)context.get(REQUEST)).getSession(true);
         if (!UserManager.getInstance().isLoggedIn(session)) {
@@ -123 +126 @@
             return "login.vm";
         }
-        // TODO handle wizard-style stuff
-        // if "finish"
-        ProfileStore.getInstance().changeSubscription(arguments, session);
-        return listSubscriptions(arguments, context);
-        // else show next page
+        if (arguments.containsKey("next_page") && arguments.get("next_page").equals("finish")) {
+            ProfileStore.getInstance().changeSubscription(arguments, session);
+            return listSubscriptions(arguments, context);
+        } else {
+            return showSubscriptionWizardPage(arguments, context, false);
+        }
     }
     
@@ -156 +160 @@
         UserManager.getInstance().createUser(arguments, session);
         return login(arguments, context);
+    }
+    
+    public String logout(Map arguments, Context context) {
+        HttpSession session = ((HttpServletRequest)context.get(REQUEST)).getSession(true);
+        Enumeration atts = session.getAttributeNames();
+        while (atts.hasMoreElements()) {
+            session.removeAttribute((String) atts.nextElement());
+        }
+        session.invalidate();
+        return "general.vm";
     }
     
@@ -211 +225 @@
         return null;
     }
+
+    /**
+     * @param arguments
+     * @param context
+     * @param create
+     * @return
+     * @throws Exception
+     */
+    private String showSubscriptionWizardPage(Map arguments, Context context, boolean create) throws Exception {
+        if (create) {
+            context.put("action", "createSubscription");
+        } else {
+            context.put("action", "editSubscription");
+        }
+        if (!arguments.containsKey("current_page")) {
+            return "sub_type-details.vm";
+        }
+        
+        HttpSession session = ((HttpServletRequest)context.get(REQUEST)).getSession(true);
+        String currentPage = (String) arguments.get("current_page");
+        String direction = (String) arguments.get("next_page");
+        
+        // save page arguments
+        savePageArgsToSession(currentPage, arguments, session);
+        
+        String nextPage = getNextPage(currentPage, direction);
+
+        // fill prefill
+        context.put("prefill", getPageArgsFromSession(nextPage, session));
+        
+        // fill preview
+        context.put("preview", getPagePreview(nextPage, session));
+        
+        // get page-specific stuff
+        if (nextPage.equals("host")) {
+            
+        } else if (nextPage.equals("collection")) {
+            
+        }
+        
+        return "sub_" + nextPage + ".vm";
+    }
+
+    /**
+     * @param nextPage
+     * @param session
+     * @return
+     */
+    private Map getPagePreview(String nextPage, HttpSession session) {
+        Map preview = new TreeMap();
+        if (nextPage.equals("type-details")) {
+            return preview;
+        }
+        preview.putAll(getPageArgsFromSession("type-details", session));
+        if (nextPage.equals("host")) {
+            return preview;
+        }
+        preview.putAll(getPageArgsFromSession("host", session));
+        if (nextPage.equals("collection")) {
+            return preview;
+        }
+        preview.putAll(getPageArgsFromSession("collection", session));
+        return preview;
+    }
+
+    /**
+     * @param currentPage
+     * @param direction
+     * @return
+     * @throws Exception
+     */
+    private String getNextPage(String currentPage, String direction) throws Exception {
+        String nextPage;
+        if (currentPage.equals("host") && direction.equals("back")) {
+            nextPage = "type-details";
+        } else if (currentPage.equals("type-details") || (currentPage.equals("collection") && direction.equals("back"))) {
+            nextPage = "host";
+        } else if (currentPage.equals("host") || (currentPage.equals("notification") && direction.equals("back"))) {
+            nextPage = "collection";
+        } else if (currentPage.equals("collection")) {
+            nextPage = "notification";
+        } else {
+            throw new Exception("unknown combination of currentPage=" + currentPage + " and nextPage=" + direction);
+        }
+        return nextPage;
+    }
+
+    /**
+     * @param page
+     * @param session
+     * @return TODO
+     */
+    private Map getPageArgsFromSession(String page, HttpSession session) {
+        Map pageArgs = (Map) session.getAttribute("page_args");
+        if (pageArgs == null || !pageArgs.containsKey(page))
+            return new TreeMap();
+        return (Map) pageArgs.get(page);
+    }
+
+    /**
+     * @param page
+     * @param arguments
+     * @param session
+     */
+    private void savePageArgsToSession(String page, Map arguments, HttpSession session) {
+        Map pageArgs = (Map) session.getAttribute("page_args");
+        if (pageArgs == null) {
+            pageArgs = new TreeMap();
+        }
+        pageArgs.put(page, arguments);
+        session.setAttribute("page_args", pageArgs);
+    }
 }

trunk/greenstone3-extensions/gsdl-as/web/default.css

@@ -51 +51 @@
     color: #666633;
 }
-
-img.help {
-    cursor: help;
-}

trunk/greenstone3-extensions/gsdl-as/web/form.css

@@ -11 +11 @@
 }
 
+td, th {
+    padding: 0px 5px;
+}
+
+thead tr {
+    background-color: #CCCCCC;
+}
+
+tr.even {
+    background-color: #CCCCCC;
+}
+
+.explanation {
+    font-size: small;
+}
+
+#progress {
+    font-size: x-small;
+    border: 0px solid black;
+    width: 80%;
+    margin: 5px auto;
+}
+
+#progress td {
+    width: 25%;
+    vertical-align: top;
+    text-align: center;
+    color: #555;
+    border-top: 10px solid #CCC;
+}
+
+#progress td.completed {
+    border-top-color: #9CBE9C;
+    color: #000;
+}
+
+#progress td.current {
+    background-color: #F0E68C;
+    font-style: italic;
+    color: #000;
+}
+
+table.subscription {
+    font-size: small;
+}
+
+.rssbutton {
+    background: #ff6600;
+    color: #ffffff;
+    border-left:   1px solid #cc9966;
+    border-top:    1px solid #ccaa99;
+    border-right:  1px solid #993300;
+    border-bottom: 1px solid #331100;
+    padding: 0px 0.5em 0px 0.5em;
+    font-family: helvetica, arial, sans-serif;
+    font-weight: bold;
+    font-size: xx-small;
+    margin-top: 1em;
+}
+

trunk/greenstone3-extensions/gsdl-as/web/subscribe.html

@@ -17 +17 @@
             You can subscribe to be notified of events about these elements:
             <ul>
-                <li><a href="sub_document.html">documents</a> (new, modified or deleted documents)</li>
+                <li><a href="/alerting/service?action=createSubscription">documents</a> (new, modified or deleted documents)</li>
                 <li><a href="sub_docparts.html">parts of documents</a> (new, modified or deleted parts of documents)</li>
                 <li><a href="sub_metadata.html">document metadata</a> (new, modified or deleted metadata of documents)</li>