From 3b9902e3953b1b6ccd581f748424a88ea1790e8f Mon Sep 17 00:00:00 2001
From: daviddelikat <david-delikat@usa.net>
Date: Wed, 11 Nov 2009 22:29:21 -0600
Subject: [PATCH] cleaned up the EMS submission system

---
 ...import_ems_ems-badge-listing-default.wgpkg | Bin 3494 -> 3504 bytes
 ...import_ems_ems-event-submission-main.wgpkg | Bin 2565 -> 2462 bytes
 ...mport_ems_ems-event-submission-queue.wgpkg | Bin 2380 -> 2398 bytes
 ...root_import_ems_ems-event-submission.wgpkg | Bin 1689 -> 1667 bytes
 docs/upgrades/upgrade_7.8.4-7.8.5.pl          |   9 +--
 lib/WebGUI/Asset/EMSSubmission.pm             |  10 ++-
 lib/WebGUI/Asset/EMSSubmissionForm.pm         |  21 +++--
 .../Asset/Wobject/EventManagementSystem.pm    |  75 +++++++++++++-----
 .../English/Asset_EventManagementSystem.pm    |   6 +-
 t/Asset/EMSSubmissionForm.t                   |   2 +
 www/extras/wobject/EMS/submission.js          |   2 +-
 11 files changed, 85 insertions(+), 40 deletions(-)

diff --git a/docs/upgrades/packages-7.8.5/root_import_ems_ems-badge-listing-default.wgpkg b/docs/upgrades/packages-7.8.5/root_import_ems_ems-badge-listing-default.wgpkg
index 64aa307a4c4de947b7032f49f26db2c7d4a14920..d6f737f0b6ec6cfddfe60d4c214af698f22ccfc3 100644
GIT binary patch
literal 3504
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

literal 3494
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
UwZK;k{6j79f6G;iJ^(rZ0NMe@%m4rY

diff --git a/docs/upgrades/packages-7.8.5/root_import_ems_ems-event-submission-main.wgpkg b/docs/upgrades/packages-7.8.5/root_import_ems_ems-event-submission-main.wgpkg
index 715fadb732ed9ca4054db31a8653d228e8c56a67..444ff1c12200112081a28d53bc2d700c5f0824a3 100644
GIT binary patch
literal 2462
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

literal 2565
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
b^?c{?eFeU+!1oncVFmsH7%T-o04x9i;luAD

diff --git a/docs/upgrades/packages-7.8.5/root_import_ems_ems-event-submission-queue.wgpkg b/docs/upgrades/packages-7.8.5/root_import_ems_ems-event-submission-queue.wgpkg
index 717ff6cd2317a56800a8be42d692162f3dc11c33..134eb6a44ef5476ac1afbbd9dc74328a939eb481 100644
GIT binary patch
literal 2398
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
QzxKd?0WS!$FaRt700+U8Bme*a

literal 2380
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

diff --git a/docs/upgrades/packages-7.8.5/root_import_ems_ems-event-submission.wgpkg b/docs/upgrades/packages-7.8.5/root_import_ems_ems-event-submission.wgpkg
index 33b66b03f114c2d12ff9d225d2f4de47f0ba32cd..4e450b23f5dbad67ee7fc3c1e6f7e82bfcf3855f 100644
GIT binary patch
literal 1667
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
Nz<*D5p-=!I004qtHrN0F

literal 1689
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

diff --git a/docs/upgrades/upgrade_7.8.4-7.8.5.pl b/docs/upgrades/upgrade_7.8.4-7.8.5.pl
index 897338a92..04c47c2fd 100644
--- a/docs/upgrades/upgrade_7.8.4-7.8.5.pl
+++ b/docs/upgrades/upgrade_7.8.4-7.8.5.pl
@@ -82,6 +82,10 @@ sub addEMSSubmissionTables {
     print "\tCreate EMS Submission Tables... " unless $quiet;
     my $db = $session->db;
 
+    $db->write(<<ENDSQL);
+INSERT INTO incrementer (incrementerId,nextValue) VALUES ('submissionId',1);
+ENDSQL
+
     $db->write(<<ENDSQL);
 CREATE TABLE EMSSubmissionForm (
     assetId CHAR(22) BINARY NOT NULL,
@@ -147,11 +151,6 @@ ENDSQL
             ADD COLUMN submittedLocationsList MEDIUMTEXT;
 ENDSQL
 
-    $db->write(<<ENDSQL);
-    ALTER TABLE EventManagementSystem
-            ADD COLUMN nextSubmissionId INT;
-ENDSQL
-
     $db->write(<<ENDSQL);
     ALTER TABLE EMSEventMetaField
             ADD COLUMN helpText MEDIUMTEXT;
diff --git a/lib/WebGUI/Asset/EMSSubmission.pm b/lib/WebGUI/Asset/EMSSubmission.pm
index 8cc5a462e..d9fd4397d 100644
--- a/lib/WebGUI/Asset/EMSSubmission.pm
+++ b/lib/WebGUI/Asset/EMSSubmission.pm
@@ -449,7 +449,7 @@ sub www_editSubmission {
 	}
         $newform->submit;
 	my $title = $assetId eq 'new' ? $i18n_WG->get(99) : $asset->get('title');
-        my $content =  $asset->processStyle(
+        my $content = 
                $asset->processTemplate({
                       errors => $params->{errors} || [],
                       backUrl => $parent->getUrl,
@@ -457,14 +457,16 @@ sub www_editSubmission {
                       pageForm => $newform->print,
 		      commentForm => $self ? $self->getFormattedComments : '',
 		      commentFlag => $self ? 1 : 0 ,
-                  },$parent->getParent->get('eventSubmissionTemplateId')));
+                  },$parent->getParent->get('eventSubmissionTemplateId'));
 	   WebGUI::Macro::process( $session, \$content );
-    if( $session->form->get('asJson') ) {
+    if( $params->{asHashRef} ) {
+	return { text => $content, title => $title, };
+    } elsif( $session->form->get('asJson') ) {
         $session->http->setMimeType( 'application/json' );
 	return JSON->new->encode( { text => $content, title => $title, id => $assetId ne 'new' ? $assetId : 'new' . rand } );
     } else {
         $session->http->setMimeType( 'text/html' );
-        return $content;
+        return $asset->processStyle( $content );
     }
 }
 
diff --git a/lib/WebGUI/Asset/EMSSubmissionForm.pm b/lib/WebGUI/Asset/EMSSubmissionForm.pm
index e48a5fa3d..1be151d90 100644
--- a/lib/WebGUI/Asset/EMSSubmissionForm.pm
+++ b/lib/WebGUI/Asset/EMSSubmissionForm.pm
@@ -142,7 +142,7 @@ sub definition {
         submissionDeadline => { 
             tab          => "properties",
             fieldType    => "Date",
-            defaultValue => '677496912', # far in the future...
+            defaultValue => time , # + ( 30 * 24 * 60 * 60 ) , # 30 days
             label        => $i18n->get("submission deadline label"),
             hoverHelp    => $i18n->get("submission deadline label help")
         },
@@ -251,7 +251,9 @@ sub www_editSubmissionForm {
 		           } ( @$res ) );
 		my $title =  $i18n->get('select form to edit') ;
 		my $content = '<h1>' . $title .  '</h1><ul>' . $listOfLinks . '</ul>' ;
-		if( $session->form->get('asJson') ) {
+                if( $params->{asHashRef} ) {
+		    return { text => $content, title => $title, } ;
+		} elsif( $session->form->get('asJson') ) {
 		    $session->http->setMimeType( 'application/json' );
 		    return JSON->new->encode( { text => $content, title => $title, id => 'list' . rand } );
 		} else {
@@ -317,7 +319,9 @@ sub www_editSubmissionForm {
 	}
 	$newform->submit; 
         my $title = $assetId eq 'new' ? $i18n->get('new form') || 'new' : $asset->get('title');
-	if( $session->form->get('asJson') ) {
+	if( $params->{asHashRef} ) {
+              ; # not setting mimie type
+	} elsif( $session->form->get('asJson') ) {
 	    $session->http->setMimeType( 'application/json' );
 	} else {
 	    $session->http->setMimeType( 'text/html' );
@@ -329,7 +333,9 @@ sub www_editSubmissionForm {
 		      pageForm => $newform->print,
                   },$parent->get('eventSubmissionTemplateId'));
          WebGUI::Macro::process( $session, \$content );
-	if( $session->form->get('asJson') ) {
+	if( $params->{asHashRef} ) {
+	    return { text => $content, title => $title };
+	} elsif( $session->form->get('asJson') ) {
 	    return JSON->new->encode( { text => $content, title => $title, id => $assetId ne 'new' ? $assetId : 'new' . rand } );
 	} else {
 	    return $asset->ems->processStyle( $content );
@@ -501,7 +507,8 @@ calls www_editSubmission with assetId == new
 
 sub www_addSubmission {
     my $self = shift;
-    $self->www_editSubmission( { assetId => 'new' } );
+    my $params = shift || { };
+    $self->www_editSubmission( { assetId => 'new', %$params } );
 }
 
 #-------------------------------------------------------------------
@@ -533,7 +540,7 @@ calls WebGUI::Asset::EMSSubmission->editSubmission
 
 sub www_editSubmission {
     my $self             = shift;
-    return $self->session->privilege->insufficient() unless $self->canEdit;
+    return $self->session->privilege->insufficient() unless $self->canSubmit;
     return WebGUI::Asset::EMSSubmission->www_editSubmission($self,shift);
 }
 
@@ -547,7 +554,7 @@ validate and create a new submission
 
 sub www_editSubmissionSave {
         my $self = shift;
-        return $self->session->privilege->insufficient() unless $self->canEdit;
+        return $self->session->privilege->insufficient() unless $self->canSubmit;
         my $formParams = WebGUI::Asset::EMSSubmission->processForm($self);
         if( $formParams->{_isValid} ) {
             delete $formParams->{_isValid};
diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
index f3e62db5a..6ded9307b 100644
--- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
+++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
@@ -270,13 +270,6 @@ sub definition {
 			defaultValue 	        => '',
                         noFormPost              => 1,
 		},
-        nextSubmissionId => {
-            tab          => "properties",
-            fieldType    => "integer",
-            defaultValue => 1,
-            label        => $i18n->get("next submission id label"),
-            hoverHelp    => $i18n->get("next submission id label help")
-        },
 	);
 	push(@{$definition}, {
 		assetName=>$i18n->get('assetName'),
@@ -461,9 +454,7 @@ get a sequence number for the submission id
 
 sub getNextSubmissionId {
     my $self = shift;
-    my ($submissionId) = $self->session->db->read('select nextSubmissionId from EventManagementSystem where assetId = ?', [ $self->getId ] )->array;
-    $self->update( { nextSubmissionId => ($submissionId + 1) } );
-    return $submissionId;
+    return $self->session->db->getNextId( 'SubmissionId' );
 }
 
 #-------------------------------------------------------------------
@@ -512,6 +503,37 @@ sub getSubmissionLocations {
 }
 
 #-------------------------------------------------------------------
+
+=head2 getSubmissionForms
+
+returns a list of objects; one for each submission form related to this EMS
+
+this function is called twice in just a few lines of code so the results are cached
+to prevent extra hits to the database
+
+=cut
+
+sub getSubmissionForms {
+    my $self = shift;
+
+    return $self->{_submissionForms} if $self->{_submissionFormTime} > time;
+
+    $self->{_submissionForms} = $self->getLineage( ['children'], { returnObjects => 1,
+                 includeOnlyClasses => ['WebGUI::Asset::EMSSubmissionForm'],
+	    } );
+    $self->{_submissionFormTime} = time + 60;
+
+    return $self->{_submissionForms};
+}
+
+#-------------------------------------------------------------------
+
+=head2 getSubmissionStatus
+
+returns internationalized hash of submission status values or one internationalized name if a status is passed in
+
+=cut
+
 sub getSubmissionStatus {
     my $self  = shift;
     my $key   = shift;
@@ -724,7 +746,7 @@ sub view {
 		getBadgesUrl		=> $self->getUrl('func=getBadgesAsJson'),
 		isRegistrationStaff				=> $self->isRegistrationStaff,
 		canEdit						=> $self->canEdit,
-		canSubmit			=> $self->canSubmit,
+		canSubmit			=> $self->canSubmit && ! $self->isRegistrationStaff,
 		hasSubmissions			=> $self->hasSubmissions,
 		hasSubmissionForms			=> $self->hasSubmissionForms,
 		lookupRegistrantUrl	=> $self->getUrl('func=lookupRegistrant'),
@@ -772,9 +794,7 @@ sub www_addSubmission {
     my $form;
 
     if( ! defined $formId ) {
-           my $res = $self->getLineage(['children'],{ returnObjects => 1,
-                 includeOnlyClasses => ['WebGUI::Asset::EMSSubmissionForm'],
-             } );
+           my $res = $self->getSubmissionForms;
 	    my @new = map { $_->canSubmit ? $_ : () } ( @$res);
             if( scalar(@new) == 0 ) {
                 return $self->www_view;
@@ -2669,7 +2689,7 @@ sub www_viewSchedule {
 sub www_viewSubmissionQueue {
 	my $self             = shift;
         my $isRegistrationStaff = $self->isRegistrationStaff;
-        my $canSubmit = $self->canSubmit;
+        my $canSubmit = $self->canSubmit && ! $isRegistrationStaff;
         my $canEdit = $self->canEdit;
 	my $i18n = $self->i18n;
     return $self->session->privilege->insufficient() unless $canSubmit || $isRegistrationStaff;
@@ -2687,9 +2707,7 @@ sub www_viewSubmissionQueue {
 			linkUrl => $self->getUrl('func=viewSubmissionQueue#' . $_->getId . '_new' ),
 			ajaxUrl => $_->getUrl('func=addSubmission'),
 		} } (
-		       @{$self->getLineage( ['children'],{ returnObjects => 1,
-			     includeOnlyClasses => ['WebGUI::Asset::EMSSubmissionForm'],
-	                  } ) }
+		       @{$self->getSubmissionForms}
 		  );
 	my $params = {
 		  backUrl => $self->getUrl,
@@ -2707,9 +2725,26 @@ sub www_viewSubmissionQueue {
 		  addSubmissionFormAjaxUrl => $self->getUrl('func=addSubmissionForm'),
 		  addSubmissionAjaxUrl => $self->getUrl('func=addSubmission'),
 		  submissionFormUrls => \@submissionFormUrls,
-		  queueTabTitle   => $isRegistrationStaff ? $i18n->get('submission queue') : $i18n->get('my submissions'),
 	};
-	$params->{QueueTabData} = $self->processTemplate($params,$self->get('eventSubmissionQueueTemplateId'));
+        push( @{$params->{tabs}}, {
+	      title => $isRegistrationStaff ? $i18n->get('submission queue') : $i18n->get('my submissions'),
+	      text => $self->processTemplate($params,$self->get('eventSubmissionQueueTemplateId')),
+        } );
+        if( $isRegistrationStaff ) {
+	     for my $tabSource ( @{$self->getSubmissionForms} ) {
+	         push @{$params->{tabs}}, $tabSource->www_editSubmissionForm( { asHashRef => 1 } );
+	     }
+	     $params->{tabs}[0]{selected} = 1; # the submission queue tab
+        }
+        elsif( $canSubmit ) {
+	     for my $tabSource ( @{$self->getSubmissionForms} ) {
+		 next unless $tabSource->canSubmit;
+	         push @{$params->{tabs}}, $tabSource->www_addSubmission( { asHashRef => 1 } );
+	     }
+	     $params->{tabs}[$#{$params->{tabs}}]{selected} = 1;
+        }
+	my $tabid = 'tab01';
+	for my $tab ( @{$params->{tabs}} ) { $tab->{id} = $tabid ++; }
 
 	return $self->processStyle( 
                $self->processTemplate( $params, $self->get('eventSubmissionMainTemplateId')));
diff --git a/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm b/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm
index 48cf27cbf..b04f8de64 100644
--- a/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm
+++ b/lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm
@@ -1904,7 +1904,7 @@ normal templates.|,
     },
 
     'new submission form' => {
-        message => q|New Submission Form|,
+        message => q|Manage Event Submissions|,
         lastUpdated => 1147050475,
         context => q|Label for the link to create a new submission form.|,
     },
@@ -1922,7 +1922,7 @@ normal templates.|,
     },
 
     'new submission' => {
-        message => q|New Submission|,
+        message => q|Submit an Event|,
         lastUpdated => 1147050475,
         context => q|Label for link to create a new submission for an event.|,
     },
@@ -2042,7 +2042,7 @@ normal templates.|,
     },
 
     'submitted location list help' => {
-        message => q|Enter a listy of location names here, one name on a line.  This list will be available on the event submission form in the location select box. If this field is filled in then only these locations will be available.|,
+        message => q|Enter a list of location names here, one name on a line.  This list will be available on the event submission form in the location select box. If this field is filled in then only these locations will be available.|,
         lastUpdated => 1147050475,
         context => q|This is help text for the submitted location list field.|,
     },
diff --git a/t/Asset/EMSSubmissionForm.t b/t/Asset/EMSSubmissionForm.t
index 75eed4467..789532f8a 100644
--- a/t/Asset/EMSSubmissionForm.t
+++ b/t/Asset/EMSSubmissionForm.t
@@ -30,6 +30,8 @@ use WebGUI::Asset::Sku::EMSBadge;
 use WebGUI::Asset::Sku::EMSTicket;
 use WebGUI::Asset::Sku::EMSRibbon;
 use WebGUI::Asset::Sku::EMSToken;
+use WebGUI::Asset::EMSSubmission;
+use WebGUI::Asset::EMSSubmissionForm;
 
 #----------------------------------------------------------------------------
 # Init
diff --git a/www/extras/wobject/EMS/submission.js b/www/extras/wobject/EMS/submission.js
index 40423324b..d1428a5b8 100644
--- a/www/extras/wobject/EMS/submission.js
+++ b/www/extras/wobject/EMS/submission.js
@@ -182,6 +182,7 @@ WebGUI.EMS = function (configs) {
 				    WebGUI.EMS.i18n.get('Asset_EventManagementSystem','close tab') + '" /></span>',
 			     contentEl: myContent
 			 });
+		       initHoverHelp( myTab );
 		       WebGUI.EMS.tabs.addTab( myTab );
 		       var index = WebGUI.EMS.tabs.getTabIndex(myTab);
 		       YAHOO.util.Event.on(myTab.getElementsByClassName('close')[0], 'click', WebGUI.EMS.closeTab , myTab);
@@ -200,7 +201,6 @@ WebGUI.EMS = function (configs) {
 		   // delete WebGUI.ticketJScriptRun;
 		   WebGUI.EMS.loadingIndicator.hide();
 		   WebGUI.EMS.lastTab = WebGUI.EMS.tabs.get('activeTab');
-		   //initHoverHelp(myTab);
 		   WebGUI.EMS.tabs.set('activeTab',myTab);
 	       },
 	    failure: function(o) {