Changeset 1041

Timestamp:

06/24/09 02:05:21 (4 years ago)

Author:

glickn

Message:

Users can now send project invites.

When a user receives an invite they are alerted on their My Projects page. A link will only display if the user has an invite and if they have an invite it says how many invites they have.

i.e. "You have 1 project invite!" / "You have 2 project invites!"

The page to accept invites is not yet implemented.

Added a "Make Subsamples public" link in the sample details page (also not yet implemented. The subsamples list needs to be converted to the DataList? class first.)

Location:

trunk

Files:

• mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/details/SampleDetails.java (modified) (1 diff)
• mpdb-client/src/edu/rpi/metpetdb/client/ui/project/ProjectInvite.java (modified) (4 diffs)
• mpdb-client/src/edu/rpi/metpetdb/client/ui/user/UserProjectsListEx.java (modified) (1 diff)
• mpdb-common/src/edu/rpi/metpetdb/client/locale/LocaleText.java (modified) (1 diff)
• mpdb-common/src/edu/rpi/metpetdb/client/locale/LocaleText.properties (modified) (1 diff)
• mpdb-common/src/edu/rpi/metpetdb/client/model/Invite.java (modified) (1 diff)
• mpdb-common/src/edu/rpi/metpetdb/client/model/Project.java (modified) (2 diffs)
• mpdb-common/src/edu/rpi/metpetdb/client/model/User.java (modified) (2 diffs)
• mpdb-common/src/edu/rpi/metpetdb/client/service/ProjectService.java (modified) (1 diff)
• mpdb-common/src/edu/rpi/metpetdb/client/service/ProjectServiceAsync.java (modified) (1 diff)
• mpdb-server/schema/metpetdb-perms.sql (modified) (1 diff)
• mpdb-server/src/edu/rpi/metpetdb/server/dao/Project.hbm.xml (modified) (1 diff)
• mpdb-server/src/edu/rpi/metpetdb/server/dao/User.hbm.xml (modified) (1 diff)
• mpdb-server/src/edu/rpi/metpetdb/server/dao/impl/ProjectDAO.java (modified) (3 diffs)
• mpdb-server/src/edu/rpi/metpetdb/server/impl/ProjectServiceImpl.java (modified) (2 diffs)

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/objects/details/SampleDetails.java

@@ -198 +198 @@
                 });
                 addSubsample.addStyleName(CSS.ADDLINK);
-                subsamples_ft.setWidget(0, 1, addSubsample);
+                subsamples_ft.setWidget(0, 2, addSubsample);
+                
+                final MLink makeSubsamplesPublic = new MLink(LocaleHandler.lc_text
+                                .makeSubsamplePublic(), new ClickListener() {
+                        public void onClick(final Widget sender) {
+                                
+                        }
+                });
+                makeSubsamplesPublic.addStyleName(CSS.BETA);
+                subsamples_ft.setWidget(0, 1, makeSubsamplesPublic);
 
                 Label Subsamples_label = new Label(LocaleHandler.lc_text.subsamples());;

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/project/ProjectInvite.java

@@ -1 +1 @@
 package edu.rpi.metpetdb.client.ui.project;
 
+import com.google.gwt.user.client.History;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.Button;
@@ -11 +12 @@
 import edu.rpi.metpetdb.client.model.User;
 import edu.rpi.metpetdb.client.ui.MpDb;
+import edu.rpi.metpetdb.client.ui.TokenSpace;
 import edu.rpi.metpetdb.client.ui.commands.ServerOp;
 import edu.rpi.metpetdb.client.ui.input.ObjectEditorPanel;
@@ -46 +48 @@
                                                 if(result != null){
                                                         i.setMember_id(result.getId());
-                                                        MpDb.project_svc.saveInvite(i, ac);
-                                                }
-                                                else{
-                                                        //TODO throw an error about the user not existing
+                                                        new ServerOp<Invite>() {
+                                                                public void begin() {   
+                                                                        MpDb.project_svc.saveInvite(i, this);
+                                                                }
+                                                                public void onSuccess(final Invite result){
+                                                                        new ServerOp<Project> () {
+                                                                                public void begin() {
+                                                                                        AsyncCallback<Project> ac;
+                                                                                        MpDb.project_svc.details(result.getProject_id(), this);
+                                                                                }
+                                                                                public void onSuccess(final Project result){
+                                                                                        History.newItem(TokenSpace.descriptionOf((Project) result));
+                                                                                }
+                                                                        }.begin();
+                                                                }
+                                                        }.begin();
+                                                        
                                                 }
                                         }
@@ -56 +71 @@
                         
                         protected void deleteBean(final AsyncCallback<Object> ac) {}
-                        
-                        protected void onSaveCompletion(final Project result) {
-                                /*if (savedNew)
-                                        MpDb.currentUser().getProjects().add((Project) result);
-                                this.show(result);*/
-                        }
                 };
                 Button save = p_user.getSaveButton();

trunk/mpdb-client/src/edu/rpi/metpetdb/client/ui/user/UserProjectsListEx.java

@@ -53 +53 @@
                                         }
                                 });
+                
+                //Look for invites and display a link only if invites exist
+                new ServerOp() {
+                        public void begin(){
+                                MpDb.project_svc.getInvitesForUser(MpDb.currentUser().getId(), this);
+                        }
+                        public void onSuccess(final Object result){
+                                List<Project> invites = (List<Project>) result;
+                                if(invites != null && invites.size() > 0){
+                                        final MLink newInvites = new MLink("You have " + invites.size() + " project invite" +
+                                                        (invites.size() > 1 ? "s!" : "!"), 
+                                                        new ClickListener(){
+                                                                public void onClick(Widget sender) {
+                                                                        //TODO: go to my invites page
+                                                                }       
+                                        });
+                                        newInvites.addStyleName("beta");
+                                        header1.setWidget(0, 1, newInvites);
+                                }
+                        }
+                }.begin();
 
                 final MLink simple = new MLink("Simple", new ClickListener() {

trunk/mpdb-common/src/edu/rpi/metpetdb/client/locale/LocaleText.java

@@ -40 +40 @@
         String addSubsampleDescription(String sampleNumber);
         String noSubsamplesFound();
+        String makeSubsamplePublic();
 
         /* Mineral Analyses */

trunk/mpdb-common/src/edu/rpi/metpetdb/client/locale/LocaleText.properties

@@ -43 +43 @@
 addSubsampleDescription = Use the form below to add a subsample to {0}
 noSubsamplesFound = No subsamples associated with this sample were found.
+makeSubsamplePublic = Make Subsamples Public
 
 # Chemical Analyses

trunk/mpdb-common/src/edu/rpi/metpetdb/client/model/Invite.java

@@ -11 +11 @@
 
         public boolean mIsNew() {
-                return project_id == 0;
+                return true;
         }
 

trunk/mpdb-common/src/edu/rpi/metpetdb/client/model/Project.java

@@ -20 +20 @@
         private Set<Sample> samples;
         
-        private Set<Invite> invites;
+        private Set<User> invites;
 
         public int getId() {
@@ -82 +82 @@
         }
         
-        public Set<Invite> getInvites() {
+        public Set<User> getInvites() {
                 if(invites == null)
-                        invites = new HashSet<Invite>();
+                        invites = new HashSet<User>();
                 return invites;
         }
         
-        public void setInvites(final Set<Invite> i) {
+        public void setInvites(final Set<User> i) {
                 invites = i;
         }

trunk/mpdb-common/src/edu/rpi/metpetdb/client/model/User.java

@@ -36 +36 @@
         @ContainedIn
         private Set<Sample> samples;
-        private Set<Invite> invites;
+        private Set<Project> invites;
         private Role role;
         private Integer rank;
@@ -158 +158 @@
         }
         
-                public Set<Invite> getInvites() {
+                public Set<Project> getInvites() {
                 if(invites == null)
-                        invites = new HashSet<Invite>();
+                        invites = new HashSet<Project>();
                 return invites;
         }
         
-        public void setInvites(final Set<Invite> i) {
+        public void setInvites(final Set<Project> i) {
                 invites = i;
         }

trunk/mpdb-common/src/edu/rpi/metpetdb/client/service/ProjectService.java

@@ -56 +56 @@
         
         Invite saveInvite(Invite i) throws MpDbException;
+        
+        List<Project> getInvitesForUser(int id) throws MpDbException;
 }

trunk/mpdb-common/src/edu/rpi/metpetdb/client/service/ProjectServiceAsync.java

@@ -30 +30 @@
                         AsyncCallback<Results<User>> ac);
 
-        void saveInvite(Invite i, AsyncCallback<User> ac);
+        void saveInvite(Invite i, AsyncCallback<Invite> ac);
+        
+        void getInvitesForUser(int id, AsyncCallback<List<Project>> ac);
 }

trunk/mpdb-server/schema/metpetdb-perms.sql

@@ -1 +1 @@
 GRANT select,insert       ,delete ON minerals        TO @APPUSER@;
 GRANT select,insert       ,delete ON mineral_relationships        TO @APPUSER@;
+GRANT select,insert,update,delete ON project_invites TO @APPUSER@;
 GRANT select,insert,update,delete        ON projects        TO @APPUSER@;
 GRANT select,insert       ,delete ON project_members TO @APPUSER@;

trunk/mpdb-server/src/edu/rpi/metpetdb/server/dao/Project.hbm.xml

@@ -63 +63 @@
     order by p.owner.emailAddress
   </query>
-  
   
   <query name="Project.samples,size">

trunk/mpdb-server/src/edu/rpi/metpetdb/server/dao/User.hbm.xml

@@ -62 +62 @@
     where u.id = :id
   </query>
+  
+  <query name="User.invites">
+    select invite
+    from User u
+    inner join u.invites as invite
+    where u.id = :id
+  </query>
 
   <query name="User.byEmailAddress">

trunk/mpdb-server/src/edu/rpi/metpetdb/server/dao/impl/ProjectDAO.java

@@ -2 +2 @@
 
 import java.util.List;
+import java.util.Set;
 
 import org.hibernate.Query;
@@ -35 +36 @@
                         final Query q = namedQuery("Project.byId");
                         q.setLong("id", inst.getId());
-                        if (getResult(q) != null)
-                                return (Project) getResult(q);
+                        Project p = (Project) getResult(q);
+                        if (p != null)
+                                return p;
                 }
 
@@ -85 +87 @@
                 return new Results<User>(size, l);
         }
+
+        public Invite saveInvite(Invite i, User u) throws MpDbException {
+                Project p = new Project();
+                p.setId(i.getProject_id());
+                p = fill(p);
+                p.getInvites().add(u);
+                save(p);
+                return i;
+        }
+        
+        public List<Project> getInvitesForUser(int id) throws MpDbException {
+                final Query q = namedQuery("User.invites");
+                q.setInteger("id", id);
+                final List<Project> l = (List<Project>) getResults(q);
+                return l;
+        }
 }

trunk/mpdb-server/src/edu/rpi/metpetdb/server/impl/ProjectServiceImpl.java

@@ -17 +17 @@
 import edu.rpi.metpetdb.server.dao.impl.SampleDAO;
 import edu.rpi.metpetdb.server.dao.impl.UserDAO;
-import edu.rpi.metpetdb.server.dao.impl.InviteDAO;
 
 public class ProjectServiceImpl extends MpDbServlet implements ProjectService {
@@ -62 +61 @@
         
         public Invite saveInvite(Invite i) throws MpDbException {
-                return (new InviteDAO(this.currentSession()).save(i));
+                User u = new User();
+                u.setId(i.getMember_id());
+                u = (new UserDAO(this.currentSession())).fill(u);
+                new ProjectDAO(this.currentSession()).saveInvite(i, u);
+                commit();
+                return i;
+        }
+        
+        public List<Project> getInvitesForUser(int id) throws MpDbException {
+                return new ProjectDAO(currentSession()).getInvitesForUser(id);
         }
 }