X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-gui%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fgui%2Fpages%2FRoleHistory.java;h=ce3083543905430d5a5c73be3933f0744559b9af;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=234b82c21d7336b92ee2fb5b59bbbb5b71b338a8;hpb=4b5a7d721d994a49057e9bfb403c7bff1b376660;p=aaf%2Fauthz.git

diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleHistory.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleHistory.java
index 234b82c2..ce308354 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleHistory.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/pages/RoleHistory.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -60,10 +60,8 @@ public class RoleHistory extends Page {
     static final String NAME="RoleHistory";
     static final String HREF = "/gui/roleHistory";
     static final String FIELDS[] = {"role","dates"};
-    static final String WEBPHONE = "http://webphone.att.com/cgi-bin/webphones.pl?id=";
-    static enum Month { JANUARY, FEBRUARY, MARCH, APRIL, MAY, JUNE, JULY, 
-        AUGUST, SEPTEMBER, OCTOBER, NOVEMBER, DECEMBER };
-    
+
+
     public RoleHistory(final AAF_GUI gui, final Page ... breadcrumbs) throws APIException, IOException {
         super(gui.env,NAME,HREF, FIELDS,
             new BreadCrumbs(breadcrumbs),
@@ -76,29 +74,29 @@ public class RoleHistory extends Page {
                         @Override
                         public void code(final AAF_GUI gui, final AuthzTrans trans,    final Cache<HTMLGen> cache, final HTMLGen hgen)    throws APIException, IOException {
                             String obRole = trans.get(role, null);
-                            
+
                             // Use Javascript to make the table title more descriptive
                             hgen.js()
                             .text("var caption = document.querySelector(\".title\");")
-                            .text("caption.innerHTML='History for Role [ " + obRole + " ]';")                        
+                            .text("caption.innerHTML='History for Role [ " + obRole + " ]';")
                             .done();
-                            
+
                             // Use Javascript to change Link Target to our last visited Detail page
                             String lastPage = RoleDetail.HREF + "?role=" + obRole;
                             hgen.js()
-                                .text("alterLink('roledetail', '"+lastPage + "');")                            
+                                .text("alterLink('roledetail', '"+lastPage + "');")
                                 .done();
-                            
+
                             hgen.br();
-                            hgen.leaf("a", "href=#advanced_search","onclick=divVisibility('advanced_search');").text("Advanced Search").end()
+                            hgen.leaf("a", "href=#advanced_search","onclick=divVisibility('advanced_search');","class=greenbutton").text("Advanced Search").end()
                                 .divID("advanced_search", "style=display:none");
                             hgen.incr("table");
-                                
+
                             addDateRow(hgen,"Start Date");
                             addDateRow(hgen,"End Date");
                             hgen.incr("tr").incr("td");
                             hgen.tagOnly("input", "type=button","value=Get History",
-                                    "onclick=datesURL('"+HREF+"?role=" + obRole+"');");
+                                    "onclick=datesURL('"+HREF+"?role=" + obRole+"');","class=greenbutton");
                             hgen.end().end();
                             hgen.end();
                             hgen.end();
@@ -108,9 +106,9 @@ public class RoleHistory extends Page {
             }
 
             );
-        
+
     }
-    
+
     private static void addDateRow(HTMLGen hgen, String s) {
         hgen
             .incr("tr")
@@ -120,7 +118,7 @@ public class RoleHistory extends Page {
             .incr("td")
             .incr("select", "name=month"+s.substring(0, s.indexOf(' ')), "id=month"+s.substring(0, s.indexOf(' ')), "required")
             .incr("option", "value=").text("Month").end();
-        for (Month m : Month.values()) {
+        for (NsHistory.Month m : NsHistory.Month.values()) {
             if (Calendar.getInstance().get(Calendar.MONTH) == m.ordinal()) {
                 hgen.incr("option", "selected", "value="+(m.ordinal()+1)).text(m.name()).end();
             } else {
@@ -131,16 +129,16 @@ public class RoleHistory extends Page {
             .end()
             .incr("td")
             .tagOnly("input","type=number","id=year"+s.substring(0, s.indexOf(' ')),"required",
-                    "value="+Calendar.getInstance().get(Calendar.YEAR), "min=1900", 
+                    "value="+Calendar.getInstance().get(Calendar.YEAR), "min=1900",
                     "max="+Calendar.getInstance().get(Calendar.YEAR),
                     "placeholder=Year").end()
             .end();
     }
-    
-    
+
+
     /**
      * Implement the Table Content for History
-     * 
+     *
      * @author Jeremiah
      *
      */
@@ -148,25 +146,25 @@ public class RoleHistory extends Page {
         private static final String[] headers = new String[] {"Date","User","Memo"};
         private Slot role;
         private Slot dates;
-        
+
         public Model(AuthzEnv env) {
             role = env.slot(NAME+".role");
             dates = env.slot(NAME+".dates");
         }
-        
+
         @Override
         public String[] headers() {
             return headers;
         }
-        
+
         @Override
         public Cells get(final AuthzTrans trans, final AAF_GUI gui) {
             final String oName = trans.get(role,null);
             final String oDates = trans.get(dates,null);
-            
+
             Cells rv = Cells.EMPTY;
-            if(oName!=null) {
-                
+            if (oName!=null) {
+
                 try {
                     rv = gui.clientAsUser(trans.getUserPrincipal(), new Retryable<Cells>() {
                         @Override
@@ -183,14 +181,14 @@ public class RoleHistory extends Page {
                                     tt.done();
                                     tt = trans.start("Load History Data", Env.SUB);
                                     List<Item> histItems = fh.value.getItem();
-                                    
+
                                     java.util.Collections.sort(histItems, new Comparator<Item>() {
                                         @Override
                                         public int compare(Item o1, Item o2) {
                                             return o2.getTimestamp().compare(o1.getTimestamp());
                                         }
                                     });
-                                    
+
                                     for (Item i : histItems) {
                                         String user = i.getUser();
                                         AbsCell userCell = new TextCell(user);
@@ -211,7 +209,7 @@ public class RoleHistory extends Page {
                                 }
                             } finally {
                                 tt.done();
-                            }    
+                            }
                             return new Cells(rv,msg);
                         }
                     });