ja ny ollaan taas tekemässä junaa kun tarvittais polkuautoa, ehkä mä ny teen ton…

… kevyesti ja myöhemmin sit raskaammin jos joku oikeasti tarttee

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/BootstrapBean.java

@@ -203,7 +203,7 @@ public class BootstrapBean implements BootstrapBeanLocal {
 				"ALTER TABLE lecture_participants ADD CONSTRAINT FK_lecture_participants_eventuser_id FOREIGN KEY (eventuser_id) REFERENCES event_users (id)",
 				"ALTER TABLE lecture_participants ADD CONSTRAINT FK_lecture_participants_lecture_id FOREIGN KEY (lecture_id) REFERENCES lectures (id)"});
 
-		dbUpdates.add(new String[] { "ALTER TABLE roles ADD COLUMN select_childrens_count integer DEFAULT null;" });
+		dbUpdates.add(new String[] { "ALTER TABLE roles ADD COLUMN user_selectable_role boolean DEFAULT false;" });
 	}
 
 	@EJB

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/RoleBean.java

@@ -219,22 +219,23 @@ public class RoleBean implements RoleBeanLocal {
 	public List<Role> getRoles(EventUser selectedUser) {
 		return roleFacade.findForUser(selectedUser);
 	}
+	
 
 	@Override
 	public void saveUserSelectableRoles(EventUser user, List<Role> roles) {
-		List<Role> allRoles = roleFacade.findAll();
+		List<Role> allRoles = roleFacade.findUserSelectableRoles();
 		for (Role ur : allRoles)
 		{
 			if (roles.contains(ur)) {
-				if (!ur.getUsers().contains(usr)) {
-					ur.getUsers().add(usr);
+				if (!ur.getUsers().contains(user)) {
+					ur.getUsers().add(user);
 				}
 			} else {
-				ur.getUsers().remove(usr);
+				ur.getUsers().remove(user);
 			}
 		}
 
-		cardTemplateBean.checkPrintedCard(usr);
+		cardTemplateBean.checkPrintedCard(user);
 		
 	}
 }

code/MoyaBeans/ejbModule/fi/codecrew/moya/facade/RoleFacade.java

@@ -66,23 +66,11 @@ public class RoleFacade extends IntegerPkGenericFacade<Role> {
 		CriteriaQuery<Role> cq = cb.createQuery(Role.class);
 		Root<Role> root = cq.from(Role.class);
 		cq.where(cb.equal(root.get(Role_.event), eventbean.getCurrentEvent()),
-				cb.greaterThan(root.get(Role_.selectChildrensCount), new Integer(0)));
+				cb.equal(root.get(Role_.userSelectableRole), Boolean.TRUE));
 		
 		List<Role> roles = getEm().createQuery(cq).getResultList();
-		ArrayList<Role> returnRoles = new ArrayList<Role>();
 		
-		// sorry for uqly loop
-		for(Role role : roles) {
-			if(role.getSelectChildrensCount() > 0) { // just in case
-				for(Role subRole : role.getChildren()) {
-					if(!returnRoles.contains(subRole)) {
-						returnRoles.add(subRole);
-					}
-				}
-			}
-		}
-		
-		return returnRoles;
+		return roles;
 	}
 
 }

code/MoyaDatabase/src/fi/codecrew/moya/model/Role.java

@@ -74,8 +74,8 @@ public class Role extends GenericEntity {
     @JoinColumn(name = EVENT_ID_COLUMN, nullable = false)
     private LanEvent event;
     
-    @Column(name = "select_childrens_count", nullable = true)
-    private Integer selectChildrensCount;
+    @Column(name = "user_selectable_role", nullable = true)
+    private boolean userSelectableRole;
 
     @ManyToMany
     @JoinTable(name = "roles_provided_by_org_roles",
@@ -212,17 +212,6 @@ public class Role extends GenericEntity {
     }
 
 
-	public Integer getSelectChildrensCount() {
-		if(selectChildrensCount == null)
-			return 0;
-		
-		return selectChildrensCount;
-	}
-
-	public void setSelectChildrensCount(Integer selectChildrensCount) {
-		this.selectChildrensCount = selectChildrensCount;
-	}
-
 	public List<Lecture> getLectures() {
 		return lectures;
 	}
@@ -232,4 +221,12 @@ public class Role extends GenericEntity {
 
 	}
 
+	public boolean isUserSelectableRole() {
+		return userSelectableRole;
+	}
+
+	public void setRserSelectableRole(boolean user_selectable_group) {
+		this.userSelectableRole = user_selectable_group;
+	}
+
 }

code/MoyaWeb/WebContent/resources/cditools/role/form.xhtml

@@ -10,8 +10,8 @@
 	<h:panelGrid columns="2">
 		<h:outputText value="#{i18n['role.name']}" />
 		<h:inputText value="#{roleView.role.name}" />
-		<h:outputText value="* #{i18n['role.selectChildrensCount']}" />
-		<h:inputText value="#{roleView.role.selectChildrensCount}" />
+		<h:outputText value="* #{i18n['role.userSelectableRole']}" />
+		<p:selectBooleanCheckbox value="#{roleView.role.userSelectableRole}" />
 
 		<h:outputText value="#{i18n['role.parents']}" />
 		<h:selectManyCheckbox converter="#{roleConverter}" layout="pageDirection" id="roleparents"
@@ -25,7 +25,7 @@
 		</h:selectOneMenu>
 
 	</h:panelGrid>
-	<h:outputText value="#{i18n['role.selectChildrensCount.note']}" /><br /><br />
+	<br /><br />
 
 </ui:composition>
 </html>

code/MoyaWeb/WebContent/resources/cditools/user/edit.xhtml

@@ -153,7 +153,7 @@
 		</h:form>
 		<h:form>
 			<h:panelGroup>
-				tähän tulee lista rooleista
+				asdf
 			
 			</h:panelGroup>
 		</h:form>

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n.properties

@@ -298,8 +298,7 @@ resetMail.username = Username
 resetmailSent.body   = Email has been sent containing a link where you can change the password.
 resetmailSent.header = Email sent
 
-role.selectChildrensCount      = K\u00E4ytt\u00E4j\u00E4 voi valita lapsia
-role.selectChildrensCount.note = * Kuinka monta roolia k\u00E4ytt\u00E4j\u00E4 voi itse valita t\u00E4m\u00E4n roolin lapsirooleista, 0 disabloi ominaisuuden.
+role.userSelectableRole       = K\u00E4ytt\u00E4j\u00E4n valittavissaoleva rooli
 
 roleView.adduser              = Lis\u00E4\u00E4 k\u00E4ytt\u00E4j\u00E4
 roleView.hidePermissioneditor = Piilota oikeusasetukset

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_en.properties

@@ -964,20 +964,19 @@ rfidevent.reader     = Reader
 rfidevent.searchuser = Search user
 rfidevent.tag        = Tag
 
-role.cardtemplate              = Cardtemplate
-role.create                    = Create role
-role.description               = Description
-role.edit                      = Edit
-role.edit.save                 = Save
-role.execute                   = (X)
-role.name                      = Name
-role.parents                   = Parents
-role.permissionheader          = Role permissions
-role.read                      = (R)
-role.savePermissions           = Save permissions
-role.selectChildrensCount      = Usen can select children
-role.selectChildrensCount.note = * How many roles user can select under this role, 0 disables this.
-role.write                     = (W)
+role.cardtemplate             = Cardtemplate
+role.create                   = Create role
+role.description              = Description
+role.edit                     = Edit
+role.edit.save                = Save
+role.execute                  = (X)
+role.name                     = Name
+role.parents                  = Parents
+role.permissionheader         = Role permissions
+role.read                     = (R)
+role.savePermissions          = Save permissions
+role.userSelectableRole       = User selectable role
+role.write                    = (W)
 
 roleView.adduser              = Add user
 roleView.hidePermissioneditor = Hide permissioneditor

code/MoyaWeb/src/fi/codecrew/moya/resources/i18n_fi.properties

@@ -949,17 +949,16 @@ rfidevent.reader     = Lukija
 rfidevent.searchuser = Hae k\u00E4ytt\u00E4j\u00E4\u00E4
 rfidevent.tag        = T\u00E4gi
 
-role.cardtemplate              = Korttipohja
-role.create                    = Luo rooli
-role.description               = Kuvaus
-role.edit                      = Muokkaa
-role.edit.save                 = Tallenna
-role.name                      = Nimi
-role.parents                   = Periytyy
-role.permissionheader          = Roolin oikeudet
-role.savePermissions           = Tallenna oikeudet
-role.selectChildrensCount      = K\u00E4yt\u00E4j\u00E4 voi valita lapsia
-role.selectChildrensCount.note = * Kuinka monta roolia k\u00E4ytt\u00E4j\u00E4 voi itse valita t\u00E4m\u00E4n roolin lapsirooleista, 0 disabloi ominaisuuden.
+role.cardtemplate             = Korttipohja
+role.create                   = Luo rooli
+role.description              = Kuvaus
+role.edit                     = Muokkaa
+role.edit.save                = Tallenna
+role.name                     = Nimi
+role.parents                  = Periytyy
+role.permissionheader         = Roolin oikeudet
+role.savePermissions          = Tallenna oikeudet
+role.userSelectableRole       = K\u00E4ytt\u00E4j\u00E4n valittavissaoleva rooli
 
 roleView.adduser              = Lis\u00E4\u00E4 k\u00E4ytt\u00E4j\u00E4
 roleView.hidePermissioneditor = Piilota oikeusasetukset