novo helper para auxiliar a criacao de slugs adicionado. Adicionado t…

…ambem slug nas paginas
demetriusfeijoo · May 14, 2012 · accc685 · accc685
1 parent b4044e1
commit accc685
Show file tree

Hide file tree

Showing 19 changed files with 90 additions and 41 deletions.
diff --git a/WebContent/WEB-INF/classes/umake_pages.hbm.xml b/WebContent/WEB-INF/classes/umake_pages.hbm.xml
@@ -15,7 +15,8 @@
         <property name="dateOfRegistration" update="false"></property>
         <property name="status"></property>
         <property name="title"></property>
-        <property name="author"></property>
+        <property name="slug"></property>
+        <property name="author" update="false"></property>
         <property name="content"></property>
 
     </class>

diff --git a/WebContent/WEB-INF/jsp/adm/index.jsp b/WebContent/WEB-INF/jsp/adm/index.jsp
@@ -20,15 +20,16 @@
 
 		<ul>
 
+			<li><a href="<c:url value="/" />">Ir para o site</a></li>
 			<li><a href="<c:url value="/adm/user/logout" />">Logout</a></li>
 			<li><a href="<c:url value="/adm/user/create" />">Criar Usuário</a></li>
-			<li><a href="<c:url value="/adm/user" />">Listar Usuário</a></li>
+			<li><a href="<c:url value="/adm/user" />">Listar Usuários</a></li>
 			<li><a href="<c:url value="/adm/group/create" />">Criar Grupo</a></li>
 			<li><a href="<c:url value="/adm/group" />">Listar Grupos</a></li>
 			<li><a href="<c:url value="/adm/permission/create" />">Criar Permissão</a></li>
 			<li><a href="<c:url value="/adm/permission" />">Listar Permissões</a></li>
 			<li><a href="<c:url value="/adm/page/create" />">Criar página</a></li>
-			<li><a href="<c:url value="/adm/page" />">Listar página</a></li>
+			<li><a href="<c:url value="/adm/page" />">Listar páginas</a></li>
 
 		</ul>
 

diff --git a/WebContent/WEB-INF/jsp/page/formPage.jsp b/WebContent/WEB-INF/jsp/page/formPage.jsp
@@ -20,7 +20,9 @@
 	<table>
 		<tr>
 			<td>Status: </td>
-			<td><label for="ativado">Ativado:</label><input type="radio" name="page.status" id="ativado" value="1" /> <label for="desativado">Desativado:</label><input type="radio" name="page.status" id="desativado" value="0" /> </td>
+			<td>
+				<label for="ativado">Ativado:</label><input type="radio" name="page.status" id="ativado" <c:if test="${page.status || page.status == null }">checked="checked"</c:if> value="1" /> 
+				<label for="desativado">Desativado:</label><input type="radio" name="page.status" id="desativado" <c:if test="${ !page.status || page.status == null }">checked="checked"</c:if> value="0" /> </td>
 		</tr>
 		<tr>
 			<td>Título: </td>

diff --git a/WebContent/admin/js/functions.js b/WebContent/admin/js/functions.js
@@ -125,6 +125,7 @@ $(function(){
 		dataType: 'json',
 		colModel : [
 			{display: 'Id', name : 'id', width : 45, sortable : true, align: 'left'},
+			{display: 'Título', name : 'title', width : 210, sortable : true, align: 'left'},
 			{display: 'Autor', name : 'author', width : 210, sortable : true, align: 'left'},
 			{display: 'Data do registro', name : 'dateOfRegistration', width : 210, sortable : true, align: 'left'}
 			],
@@ -143,6 +144,7 @@ $(function(){
              ],
          searchitems : [
               {display: 'Id', name : 'id'},
+              {display: 'Título', name : 'title'},
               {display: 'Autor', name : 'author'}
               ],
 		sortname: "id",
@@ -154,7 +156,7 @@ $(function(){
 		resizable: false,
 		showTableToggleBtn: true,
 		singleSelect: true,
-		width: 520,
+		width: 730,
 		height: 200
 	});
 

diff --git a/src/main/java/br/com/umake/controller/AdmGroupController.java b/src/main/java/br/com/umake/controller/AdmGroupController.java
@@ -11,7 +11,7 @@
 import br.com.caelum.vraptor.Result;
 import br.com.caelum.vraptor.view.Results;
 import br.com.umake.dao.AdmGroupDao;
-import br.com.umake.helper.FlexiGridJson;
+import br.com.umake.helper.flexigrid.FlexiGridJson;
 import br.com.umake.model.AdmGroup;
 import br.com.umake.permissions.PermissionAnnotation;
 import br.com.umake.permissions.PermissionType;

diff --git a/src/main/java/br/com/umake/controller/AdmPermissionController.java b/src/main/java/br/com/umake/controller/AdmPermissionController.java
@@ -11,7 +11,7 @@
 import br.com.caelum.vraptor.Result;
 import br.com.caelum.vraptor.view.Results;
 import br.com.umake.dao.AdmPermissionDao;
-import br.com.umake.helper.FlexiGridJson;
+import br.com.umake.helper.flexigrid.FlexiGridJson;
 import br.com.umake.model.AdmPermission;
 import br.com.umake.permissions.PermissionAnnotation;
 import br.com.umake.permissions.PermissionType;

diff --git a/src/main/java/br/com/umake/controller/AdmUserController.java b/src/main/java/br/com/umake/controller/AdmUserController.java
@@ -17,7 +17,7 @@
 import br.com.umake.dao.AdmGroupDao;
 import br.com.umake.dao.AdmPermissionDao;
 import br.com.umake.dao.AdmUserDao;
-import br.com.umake.helper.FlexiGridJson;
+import br.com.umake.helper.flexigrid.FlexiGridJson;
 import br.com.umake.interceptor.AdmUserControl;
 import br.com.umake.model.AdmGroup;
 import br.com.umake.model.AdmPermission;

diff --git a/src/main/java/br/com/umake/controller/IndexController.java b/src/main/java/br/com/umake/controller/IndexController.java
@@ -5,6 +5,7 @@
 import br.com.caelum.vraptor.Result;
 import br.com.caelum.vraptor.view.Results;
 import br.com.umake.model.Application;
+import br.com.umake.model.Page;
 
 @Resource
 public class IndexController {
@@ -19,20 +20,20 @@ public IndexController(Result result, Application application){
 
 	}
 
-	//@Get("/")
-	public void index(){
+	@Get("/")
+	public void index(String pageOrCategory, String complement ){
 
 		//this.result.forwardTo("/WEB-INF/jsp/index.jsp");
-		this.result.use(Results.http()).body("inicial");
+		this.result.use(Results.http()).body(pageOrCategory+" - "+complement);
 
 
 	}
 
-	//@Get({"/{namePage}", "/{namePage}/{teste}"})
-	public void page(String namePage, String teste ){
-	
-		this.result.use(Results.http()).body(namePage+" "+teste);
+	@Get("/{page.slug}")
+	public void page(Page page){
+
+		this.result.use(Results.http()).body(page.getSlug());
 
 	}
-	
+
 }
diff --git a/src/main/java/br/com/umake/controller/PageController.java b/src/main/java/br/com/umake/controller/PageController.java
@@ -13,7 +13,8 @@
 import br.com.caelum.vraptor.ioc.RequestScoped;
 import br.com.caelum.vraptor.view.Results;
 import br.com.umake.dao.PageDao;
-import br.com.umake.helper.FlexiGridJson;
+import br.com.umake.helper.flexigrid.FlexiGridJson;
+import br.com.umake.helper.utils.TextHelper;
 import br.com.umake.interceptor.AdmUserControl;
 import br.com.umake.model.Page;
 import br.com.umake.permissions.PermissionAnnotation;
@@ -73,21 +74,22 @@ public void create(Page page) {
 
 		page.setDateOfRegistration( new Date() );
 		page.setAuthor(this.admUserControl.getUserAdm().getName());
+		page.setSlug(TextHelper.createSlug(page.getTitle()));
 
-		System.out.println(page.getAuthor()+page.getContent()+page.getTitle()+page.getDateOfRegistration()+page.getStatus());
 		this.result.include("retorno", this.pageDao.insert(page) );
 		this.result.include("tipoSubmit", "cadastrado" );		
-
-    	this.result.include("page", page);
+		this.result.include("page", page);
 
 		this.result.redirectTo(this).formPage();
 
 	}
 
 	@Put("adm/page")
 	@Restrictable(permissions={ @PermissionAnnotation(context="ADM_PAGE", permissionsTypes = { PermissionType.EDIT})}) 
-	public void editAdmGroup(final Page page){
-
+	public void edit(final Page page){
+
+		page.setSlug(TextHelper.createSlug(page.getTitle()));
+
 		this.result.include("retorno", this.pageDao.edit(page) );
 		this.result.include("tipoSubmit", "editado" );
 		this.result.include("page", this.pageDao.get(page));

diff --git a/...main/java/br/com/umake/helper/Column.java → ...br/com/umake/helper/flexigrid/Column.java b/...main/java/br/com/umake/helper/Column.java → ...br/com/umake/helper/flexigrid/Column.java
@@ -1,4 +1,4 @@
-package br.com.umake.helper;
+package br.com.umake.helper.flexigrid;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...va/br/com/umake/helper/FlexiGridJson.java → ...umake/helper/flexigrid/FlexiGridJson.java b/...va/br/com/umake/helper/FlexiGridJson.java → ...umake/helper/flexigrid/FlexiGridJson.java
@@ -1,4 +1,4 @@
-package br.com.umake.helper;
+package br.com.umake.helper.flexigrid;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -59,7 +59,7 @@ private int getTotalFieldsAnnotedWithColumn(Field[] fields){
 
 		for (Field field : fields){
 
-			if(field.isAnnotationPresent(br.com.umake.helper.Column.class))					
+			if(field.isAnnotationPresent(br.com.umake.helper.flexigrid.Column.class))					
 				totalFieldsWithAnnotationColumn++;	
 
 		}
@@ -74,7 +74,7 @@ private String getNameColumnId(List<T> rows){
 
 		for (Field field : fields) {
 
-			if(field.isAnnotationPresent(br.com.umake.helper.Id.class)){
+			if(field.isAnnotationPresent(br.com.umake.helper.flexigrid.Id.class)){
 
 				return field.getName();
 
@@ -103,9 +103,9 @@ private List<String> getAttWillBeListed(List<T> rows) throws Exception{
 
 			for (Field field : fields){
 
-				if(field.isAnnotationPresent(br.com.umake.helper.Column.class)){
+				if(field.isAnnotationPresent(br.com.umake.helper.flexigrid.Column.class)){
 
-					Column column = field.getAnnotation(br.com.umake.helper.Column.class);
+					Column column = field.getAnnotation(br.com.umake.helper.flexigrid.Column.class);
 
 					if( column.position() <= minOfTheLoop && !fieldsMappeds.contains(field.getName()) ){
 

diff --git a/...ava/br/com/umake/helper/FlexiGridRow.java → .../umake/helper/flexigrid/FlexiGridRow.java b/...ava/br/com/umake/helper/FlexiGridRow.java → .../umake/helper/flexigrid/FlexiGridRow.java
@@ -1,4 +1,4 @@
-package br.com.umake.helper;
+package br.com.umake.helper.flexigrid;
 
 import java.util.List;
 

diff --git a/src/main/java/br/com/umake/helper/Id.java → ...ava/br/com/umake/helper/flexigrid/Id.java b/src/main/java/br/com/umake/helper/Id.java → ...ava/br/com/umake/helper/flexigrid/Id.java
@@ -1,4 +1,4 @@
-package br.com.umake.helper;
+package br.com.umake.helper.flexigrid;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/src/main/java/br/com/umake/helper/utils/TextHelper.java b/src/main/java/br/com/umake/helper/utils/TextHelper.java
@@ -0,0 +1,23 @@
+package br.com.umake.helper.utils;
+
+public final class TextHelper {
+
+	public static String createSlug( String originalForm ){
+
+		String generateSlug = originalForm.replaceAll("[ÁáÀàÃãÂâÄä]", "a");
+		generateSlug = generateSlug.replaceAll("[ÉéÈèÊêËë]", "e");
+		generateSlug = generateSlug.replaceAll("[ÍíÌìÎîÏï]", "i");
+		generateSlug = generateSlug.replaceAll("[ÓóÒòÕõÔôÖö]", "o");
+		generateSlug = generateSlug.replaceAll("[ÚúÙùÛûÜü]", "u");
+		generateSlug = generateSlug.replaceAll("[Ññ]", "n");
+		generateSlug = generateSlug.replaceAll("[Çç]", "c");
+		generateSlug = generateSlug.replaceAll("[ÿÝý]", "y");
+		generateSlug = generateSlug.replaceAll("[ª]", "a.");
+		generateSlug = generateSlug.replaceAll("[º]", "o.");
+		generateSlug = generateSlug.replaceAll("(\\s)++", "-");		
+
+		return generateSlug;
+
+	}
+
+}
diff --git a/src/main/java/br/com/umake/model/AdmGroup.java b/src/main/java/br/com/umake/model/AdmGroup.java
@@ -6,8 +6,8 @@
 import java.util.Set;
 
 import br.com.caelum.vraptor.ioc.Component;
-import br.com.umake.helper.Column;
-import br.com.umake.helper.Id;
+import br.com.umake.helper.flexigrid.Column;
+import br.com.umake.helper.flexigrid.Id;
 
 @Component
 public class AdmGroup{

diff --git a/src/main/java/br/com/umake/model/AdmPermission.java b/src/main/java/br/com/umake/model/AdmPermission.java
@@ -6,8 +6,8 @@
 import java.util.Set;
 
 import br.com.caelum.vraptor.ioc.Component;
-import br.com.umake.helper.Column;
-import br.com.umake.helper.Id;
+import br.com.umake.helper.flexigrid.Column;
+import br.com.umake.helper.flexigrid.Id;
 
 @Component
 public class AdmPermission {

diff --git a/src/main/java/br/com/umake/model/AdmUser.java b/src/main/java/br/com/umake/model/AdmUser.java
@@ -9,8 +9,8 @@
 import java.util.Set;
 
 import br.com.caelum.vraptor.ioc.Component;
-import br.com.umake.helper.Column;
-import br.com.umake.helper.Id;
+import br.com.umake.helper.flexigrid.Column;
+import br.com.umake.helper.flexigrid.Id;
 
 @Component
 public class AdmUser implements Serializable {

diff --git a/src/main/java/br/com/umake/model/Page.java b/src/main/java/br/com/umake/model/Page.java
@@ -5,20 +5,22 @@
 import java.util.Date;
 
 import br.com.caelum.vraptor.ioc.Component;
-import br.com.umake.helper.Column;
-import br.com.umake.helper.Id;
+import br.com.umake.helper.flexigrid.Column;
+import br.com.umake.helper.flexigrid.Id;
 
 @Component
 public class Page {
 
 	@Column(position=1)
 	@Id
 	private Long id;
-	@Column(position=3)
+	@Column(position=4)
 	private Date dateOfRegistration;
 	private Boolean status;
-	private String title;
 	@Column(position=2)
+	private String title;
+	private String slug;
+	@Column(position=3)
 	private String author;
 	private String content;
 
@@ -68,6 +70,14 @@ public String getTitle(){
 
 	}
 
+	public String getSlug(){
+
+
+		return this.slug;
+
+	}
+
+
 	public String getAuthor(){
 
 		return this.author;
@@ -101,6 +111,12 @@ public void setStatus( Boolean status ){
 	public void setTitle( String title ){
 
 		this.title = title;
+
+	}
+
+	public void setSlug(String slug){
+
+		this.slug = slug;
 
 	}
 

diff --git a/src/main/resources/umake_pages.hbm.xml b/src/main/resources/umake_pages.hbm.xml
@@ -15,7 +15,8 @@
         <property name="dateOfRegistration" update="false"></property>
         <property name="status"></property>
         <property name="title"></property>
-        <property name="author"></property>
+        <property name="slug"></property>
+        <property name="author" update="false"></property>
         <property name="content"></property>
 
     </class>