lots of work...

lib/WebGUI/Asset/EMSSubmission.pm

@@ -440,12 +440,15 @@ dav::log 'EMSSubmission::www_editSubmission: asseId ne new';
 
 sub www_editSubmissionSave {
         my $self = shift;
-        return $self->session->privilege->insufficient() unless $self->canEdit;
+        my $session = $self->session;
+        return $session->privilege->insufficient() unless $self->canEdit;
         my $formParams = WebGUI::Asset::EMSSubmission->processForm($self);
         if( $formParams->{_isValid} ) {
             delete $formParams->{_isValid};
-            $self->update($formParams);
-            return $self->getParent->getParent->www_viewSubmissionQueue;
+            $self->addRevision($formParams);
+	    WebGUI::VersionTag->autoCommitWorkingIfEnabled($session, { override => 1, allowComments => 0 });
+	    $self = $self->cloneFromDb;
+            return $self->www_view;
         } else {
             return $self->www_editSubmission($formParams);
         }
@@ -489,7 +492,7 @@ sub getEditForm {
 
 =head2 getEditTabs ( )
 
-Not to be modified, just defines 2 new tabs.
+defines 2 new tabs.
 the shop tab is created here to mimic the function of the sku-created 
 shop tab.  this class holds data like Sku assets so that they can be assigned
 in the future when the sku asset is created from this data.

lib/WebGUI/Asset/EMSSubmissionForm.pm

@@ -41,12 +41,6 @@ and then become EMSTicket's.
 
 use WebGUI::Asset::EMSSubmissionForm;
 
-=head1 TODO
-
-add a lastSubmissionDate -- after that the submission form will be closed
-    the link will still exist but the form will just say '<title> submissions closed as of <date>'
-
-
 =head1 METHODS
 
 These methods are available from this class:
@@ -75,7 +69,10 @@ sub addSubmission {
     $newParams->{className} = 'WebGUI::Asset::EMSSubmission';
     $newParams->{submissionStatus} = 'pending';
     $newParams->{submissionId} = $self->ems->getNextSubmissionId;
-    $self->addChild($newParams);
+    my $newAsset = $self->addChild($newParams);
+    WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session, { override => 1, allowComments => 0 });
+    $self = $self->cloneFromDb;
+    return $newAsset;
 }
 
 #-------------------------------------------------------------------
@@ -254,7 +251,7 @@ sub www_editSubmissionForm {
 		            return qq{<li><a href='$u' title='$d'>$n</a></li>} } ;
 	        my $listOfLinks = join '', ( map {
 		      $makeAnchorList->(
-		                $_->getUrl('func=editSubmissionForm' ),
+		                $_->getQueueUrl,
 				$_->get('title'),
 				WebGUI::HTML::filter($_->get('description'),'all')
 		             )
@@ -361,7 +358,9 @@ sub www_editSubmissionFormSave {
         my $formParams = $self->processForm();
         if( $formParams->{_isValid} ) {
             delete $formParams->{_isValid};
-            $self->update($formParams);
+            $self->addRevision($formParams);
+            WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
+            $self = $self->cloneFromDb;
             return $self->getParent->www_viewSubmissionQueue;
         } else {
             return $self->www_editSubmissionForm($formParams);
@@ -392,6 +391,19 @@ sub getFormDescription {
     return JSON->new->decode($self->get('formDescription'));
 }
 
+#-------------------------------------------------------------------
+=head2 getQueueUrl
+
+returns the URL for the submission queue page with the submisison id in the hash part
+
+=cut
+
+sub getQueueUrl {
+    my $self = shift;
+    return $self->ems->getUrl('func=viewSubmissionQueue#' . $self->getId );
+}
+
+
 #-------------------------------------------------------------------
 
 =head2 indexContent ( )

lib/WebGUI/Asset/Wobject/EventManagementSystem.pm

@@ -50,7 +50,7 @@ sub addGroupToSubmitList {
     my @ids = split(' ', $self->get('eventSubmissionGroups'));
     my %h;
     @ids = map { $h{$_}++ == 0 ? $_ : () } ( $groupId, @ids );
-    $self->addRevision({eventSubmissionGroups => join( ' ', @ids ) });
+    $self->update({eventSubmissionGroups => join( ' ', @ids ) });
 }
 
 #-------------------------------------------------------------------
@@ -94,7 +94,10 @@ sub addSubmissionForm {
     $params->{className} = 'WebGUI::Asset::EMSSubmissionForm';
     $params->{canSubmitGroupId} ||= 2;
     $self->addGroupToSubmitList($params->{canSubmitGroupId});
-    return $self->addChild($params);
+    my $newAsset = $self->addChild($params);
+    WebGUI::VersionTag->autoCommitWorkingIfEnabled($self->session);
+    $self = $self->cloneFromDb;
+    return $newAsset;
 }
 
 #-------------------------------------------------------------------
@@ -434,7 +437,7 @@ sub getNextSubmissionId {
     my $self = shift;
     #my $submissionId = $self->get('nextSubmissionId');
     my ($submissionId) = $self->session->db->read('select nextSubmissionId from EventManagementSystem where assetId = ?', [ $self->getId ] )->array;
-    $self->addRevision( { nextSubmissionId => ($submissionId + 1) } );
+    $self->update( { nextSubmissionId => ($submissionId + 1) } );
     return $submissionId;
 }
 
@@ -963,6 +966,27 @@ sub www_editBadgeGroupSave {
 	return $self->www_manageBadgeGroups;
 }
 
+#-------------------------------------------------------------------
+
+=head2  www_editSubmission 
+
+use getLineage to find the item to edit based on submissionId
+then call www_editSubmission on it
+
+=cut
+
+sub www_editSubmission {
+	my $self             = shift;
+        my $submissionId = $self->session->form->get('submissionId');
+        my $asset = $self->getLineage(['descendants'], { returnObjects => 1,
+		    joinClass          => "WebGUI::Asset::EMSSubmission",
+		    whereClause        => 'submissionId = ' . int($submissionId),
+		    includeOnlyClasses => ['WebGUI::Asset::EMSSubmission'],
+           } );
+        return $asset->[0]->www_editSubmission;
+}
+
+
 #-------------------------------------------------------------------
 
 =head2  www_editSubmissionForm 
@@ -2545,6 +2569,15 @@ sub www_viewSubmissionQueue {
 	my $i18n = $self->i18n;
     return $self->session->privilege->insufficient() unless $canSubmit || $isRegistrationStaff;
 
+	         # this map returns an array of hash refs with an id,url pair to describe the submissionForm assets
+	my @submissionFormUrls = map { {
+			id => $_->getId,
+			url => $_->getUrl('func=editSubmissionForm')
+		} } (
+		       @{$self->getLineage( ['children'],{ returnObjects => 1,
+			     includeOnlyClasses => ['WebGUI::Asset::EMSSubmissionForm'],
+	                  } ) }
+		  );
 	my $QueueTabData = 
                $self->processTemplate({
                       backUrl => $self->getUrl,
@@ -2555,8 +2588,10 @@ sub www_viewSubmissionQueue {
 		      hasSubmissionForms => $self->hasSubmissionForms,
 		      getSubmissionQueueDataUrl => $self->getUrl('func=getAllSubmissions'),
 		      addSubmissionFormUrl => $self->getUrl('func=addSubmissionForm'),
+		      editSubmissionUrl =>  $self->getUrl('func=editSubmission'), 
 		      editSubmissionFormUrl =>  $self->getUrl('func=editSubmissionForm'), 
 		      addSubmissionUrl => $self->getUrl('func=addSubmission'),
+		      submissionFormUrls => \@submissionFormUrls,
                   },$self->get('eventSubmissionQueueTemplateId'));
 
 	return $self->processStyle( 
@@ -2571,6 +2606,7 @@ sub www_viewSubmissionQueue {
 		      getSubmissionQueueDataUrl => $self->getUrl('func=getAllSubmissions'),
 		      addSubmissionFormUrl => $self->getUrl('func=addSubmissionForm'),
 		      editSubmissionFormUrl =>  $self->getUrl('func=editSubmissionForm'), 
+		      editSubmissionUrl =>  $self->getUrl('func=editSubmission'), 
 		      addSubmissionUrl => $self->getUrl('func=addSubmission'),
                   },$self->get('eventSubmissionMainTemplateId')));
 }