nearly 50% functionality
This commit is contained in:
daviddelikat
parent
1ec6646671
commit
dbf1e05635
5 changed files with 301 additions and 76 deletions
|
|
@ -196,6 +196,11 @@ sub definition {
|
|||
fieldType => "hidden",
|
||||
defaultValue => '{}',
|
||||
},
|
||||
ticketId => {
|
||||
noFormPost => 1,
|
||||
fieldType => "hidden",
|
||||
defaultValue => '',
|
||||
},
|
||||
);
|
||||
push @{$definition}, {
|
||||
assetName => $i18n->get('assetName'),
|
||||
|
|
|
|||
|
|
@ -64,15 +64,14 @@ sub addSubmission {
|
|||
my $self = shift;
|
||||
my $session = $self->session;
|
||||
my $params = shift || {};
|
||||
return undef if $self->canSubmit;
|
||||
$params = $self->validateSubmission($params);
|
||||
# TODO this whould return something so errors can be reported
|
||||
return undef if ! $self->{isValid} ;
|
||||
$params->{className} = 'WebGUI::Asset::EMSSubmission';
|
||||
$params->{status} = 'pending';
|
||||
$params->{submissionId} = $self->get('nextSubmissionId');
|
||||
$self->update({nextSubmissionId => $params->{submissionId}+1 });
|
||||
$self->addChild($params);
|
||||
return { isValid => 0, errors => [ 'no permissions' ] } if ! $self->canSubmit;
|
||||
my $newParams = $self->validateSubmission($params);
|
||||
return $newParams if ! $newParams->{isValid} ;
|
||||
$newParams->{className} = 'WebGUI::Asset::EMSSubmission';
|
||||
$newParams->{status} = 'pending';
|
||||
$newParams->{submissionId} = $self->get('nextSubmissionId');
|
||||
$self->update({nextSubmissionId => $newParams->{submissionId}+1 });
|
||||
$self->addChild($newParams);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -322,11 +321,11 @@ sub validateSubmission {
|
|||
my $submission = shift;
|
||||
my $adminOverride = JSON->new->decode( $submission->{adminOverride} || ' { } ' );
|
||||
my $session = $self->session;
|
||||
my $target = { isValid => 1 };
|
||||
my $target = { isValid => 1, adminOverride => $adminOverride };
|
||||
my $form = $self->getFormDescription;
|
||||
for my $field (keys %{$form}) {
|
||||
my $value = $submission->{$field} || $form->{field}{default} || '';
|
||||
next if defined $adminOverride->{$field} && ( $value == $adminOverride->{$field} || $value eq $adminOverride->{$field} );
|
||||
next if not defined $form->{$field}{type};
|
||||
my $value = $submission->{$field} || $form->{$field}{default} || '';
|
||||
$self->validateSubmissionField( $value, $form->{$field}, $field, $target );
|
||||
}
|
||||
return $target;
|
||||
|
|
@ -358,6 +357,24 @@ sub validateSubmissionField {
|
|||
my $fieldDef = shift;
|
||||
my $name = shift;
|
||||
my $target = shift;
|
||||
if( exists $target->{adminOverride}{$name} ) {
|
||||
if( ( $target->{adminOverride}{$name}{type} =~ /(float|integer)/i
|
||||
&& $target->{adminOverride}{$name}{value} == $value )
|
||||
|| $target->{adminOverride}{$name}{value} eq $value
|
||||
) {
|
||||
$target->{$name} = $value;
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
if( $value eq '' ) {
|
||||
$target->{$name} = $value;
|
||||
return 1;
|
||||
}
|
||||
if( $fieldDef->{required} && $value eq '' ) {
|
||||
$target->{isvalid} = 0;
|
||||
push @{$target->{errors}}, $name . ' is a required field';
|
||||
return 0;
|
||||
}
|
||||
my $type = $fieldDef->{type};
|
||||
if( $type eq 'url' ) {
|
||||
if( $value !~ /^http:/ ) { # TODO get a better test for Earls
|
||||
|
|
@ -365,6 +382,10 @@ sub validateSubmissionField {
|
|||
push @{$target->{errors}}, $name . ' is not a valid Url';
|
||||
return 0;
|
||||
}
|
||||
} elsif( $type eq 'integer' ) {
|
||||
$value = int( $value );
|
||||
} elsif( $type eq 'float' ) {
|
||||
; # there is no test here...
|
||||
} elsif( $type eq 'text' ) {
|
||||
; # there is no test here...
|
||||
} elsif( $type eq 'textarea' ) {
|
||||
|
|
@ -372,7 +393,7 @@ sub validateSubmissionField {
|
|||
} elsif( $type eq 'selectList' ) {
|
||||
if( ! grep { $_ eq $value } @{$fieldDef->{options}} ) {
|
||||
$target->{isValid} = 0;
|
||||
push @{$target->{errors}}, $name . ' is not a valid Url';
|
||||
push @{$target->{errors}}, $name . ' is not a valid Selection';
|
||||
return 0;
|
||||
}
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -93,11 +93,7 @@ sub addSubmissionForm {
|
|||
$params->{className} = 'WebGUI::Asset::EMSSubmissionForm';
|
||||
$params->{canSubmitGroupId} ||= 2;
|
||||
$self->addGroupToSubmitList($params->{canSubmitGroupId});
|
||||
# TODO re-edit the Badge view template and save it, see that it gets added after resets
|
||||
# TODO see how hard it would be to dump the whole template class to the file system
|
||||
#-- ultimate goal is to figure out what is failing in the test battery...
|
||||
# also add tests for Form_Div
|
||||
$self->addChild($params);
|
||||
return $self->addChild($params);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -189,32 +185,32 @@ sub definition {
|
|||
},
|
||||
eventSubmissionTemplateId => {
|
||||
fieldType => 'template',
|
||||
defaultValue => 'eventSubmissionTmplt01',
|
||||
tab => 'display',
|
||||
label => $i18n->get('print ticket template'),
|
||||
hoverHelp => $i18n->get('print ticket template help'),
|
||||
namespace => 'EMS/SubmissionForm',
|
||||
defaultValue => '8tqyQx-LwYUHIWOlKPjJrA',
|
||||
tab => 'display',
|
||||
label => $i18n->get('event submission template'),
|
||||
hoverHelp => $i18n->get('event submission template help'),
|
||||
namespace => 'EMS/Submission',
|
||||
},
|
||||
viewEventSubmissionQueueTemplateId => {
|
||||
fieldType => 'template',
|
||||
defaultValue => 'eventQueueTmplate00001',
|
||||
tab => 'display',
|
||||
label => $i18n->get('print ticket template'),
|
||||
hoverHelp => $i18n->get('print ticket template help'),
|
||||
defaultValue => 'ktSvKU8riGimhcsxXwqvPQ',
|
||||
tab => 'display',
|
||||
label => $i18n->get('event submission queue template'),
|
||||
hoverHelp => $i18n->get('event submission queue template help'),
|
||||
namespace => 'EMS/SubmissionQueue',
|
||||
},
|
||||
editEventSubmissionTemplateId => {
|
||||
eventSubmissionFormTemplateId => {
|
||||
fieldType => 'template',
|
||||
defaultValue => 'editEventSubmissionT01',
|
||||
tab => 'display',
|
||||
label => $i18n->get('print ticket template'),
|
||||
hoverHelp => $i18n->get('print ticket template help'),
|
||||
namespace => 'EMS/EditSubmission',
|
||||
defaultValue => 'ylBSKblMdKpcDSIK2t_Ang',
|
||||
tab => 'display',
|
||||
label => $i18n->get('event submission form template'),
|
||||
hoverHelp => $i18n->get('event submission form template help'),
|
||||
namespace => 'EMS/SubmissionForm',
|
||||
},
|
||||
badgeInstructions => {
|
||||
fieldType => 'HTMLArea',
|
||||
defaultValue => $i18n->get('default badge instructions'),
|
||||
tab => 'properties',
|
||||
defaultValue => $i18n->get('default badge instructions'),
|
||||
tab => 'properties',
|
||||
label => $i18n->get('badge instructions'),
|
||||
hoverHelp => $i18n->get('badge instructions help'),
|
||||
},
|
||||
|
|
@ -498,11 +494,11 @@ returns true if the current user has submission forms in this EMS
|
|||
sub hasSubmissions {
|
||||
my $self = shift;
|
||||
return 0 if ! $self->canSubmit;
|
||||
my @res = $self->getLineage(['descendants'],{ limit => 1,
|
||||
my $res = $self->getLineage(['descendants'],{ limit => 1,
|
||||
includeOnlyClasses => ['WebGUI::Asset::EMSSubmission'],
|
||||
whereClause => q{createdBy='} . $self->session->user->userId . q/'/,
|
||||
} );
|
||||
return scalar(@res);
|
||||
return scalar(@$res);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
@ -640,6 +636,19 @@ sub www_addRibbonToBadge {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 www_addSubmissionForm ()
|
||||
|
||||
this will call the www_editSubmissionForm function with assetId == 'new'
|
||||
|
||||
=cut
|
||||
|
||||
sub www_addSubmissionForm {
|
||||
my $self = shift;
|
||||
$self->www_editSubmiossionForm( { assetId => 'new' } );
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 www_addTicketsToBadge ()
|
||||
|
||||
Adds selected tickets to a badge. Expects two form parameters, assetId (multiples fine) and badgeId, where assetId represents the ticket and badgeId represents the badge.
|
||||
|
|
@ -816,6 +825,54 @@ sub www_editBadgeGroupSave {
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 www_editSubmissionForm
|
||||
|
||||
is assetId is 'new' edit a blank form, else edit a form with stuff filled in...
|
||||
|
||||
=cut
|
||||
|
||||
sub www_editSubmissionForm {
|
||||
my $self = shift;
|
||||
return $self->session->privilege->insufficient() unless $self->canEdit;
|
||||
# TODO add code to send a list of links if we are not creating a new form and trhere exist more
|
||||
# than one form
|
||||
# -- getlineage for forms in this EMS
|
||||
# if there is one form, then edit that form
|
||||
# if there are more than one form then create a simple page with a link to each form that can be editted
|
||||
|
||||
# this stuff below needs to be converted to use a template...
|
||||
my ($form, $db) = $self->session->quick(qw(form db));
|
||||
my $f = WebGUI::HTMLForm->new($self->session, action=>$self->getUrl);
|
||||
$f->hidden(name=>'func', value=>'editSubmissionFormSave');
|
||||
my $i18n = WebGUI::International->new($self->session, "Asset_EventManagementSystem");
|
||||
$f->hidden(name=>'assetId', value=>$form => 'new' );
|
||||
$f->text(
|
||||
name => 'name',
|
||||
value => '',
|
||||
label => 'junk',
|
||||
hoverHelp => 'help with junk',
|
||||
);
|
||||
$f->submit;
|
||||
return $self->processStyle('<h1>the title </h1>'.$f->print);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 www_editSubmissionFormSave
|
||||
|
||||
|
||||
=cut
|
||||
|
||||
sub www_editSubmissionFormSave {
|
||||
my $self = shift;
|
||||
return $self->session->privilege->insufficient() unless $self->canEdit;
|
||||
my $form = $self->session->form;
|
||||
# TOOD call addSubmissionForm or update the submission form...
|
||||
return $self->www_view; # TODO where to go after this???
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 www_editEventMetaField ( )
|
||||
|
||||
Displays the edit form for event meta fields.
|
||||
|
|
@ -2085,6 +2142,22 @@ sub www_moveEventMetaFieldUp {
|
|||
return $self->www_manageEventMetaFields;
|
||||
}
|
||||
|
||||
#---------------------------------------------
|
||||
=head2 www_newSubmission
|
||||
|
||||
if only one form is available to this user:
|
||||
call the viewSubmission with class and assetID = 'new'
|
||||
else create a list of link that will distinguish the form the userdesires to use.
|
||||
the links should refer to this function and include a formId parameter
|
||||
|
||||
=cut
|
||||
|
||||
sub www_newSubmission {
|
||||
|
||||
# call viewSubmission or create a list of links
|
||||
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 www_printBadge ( )
|
||||
|
|
@ -2236,6 +2309,27 @@ sub www_viewSchedule {
|
|||
sub www_viewSubmission {
|
||||
|
||||
# fill the view submission template
|
||||
my $self = shift;
|
||||
return $self->session->privilege->insufficient() unless $self->canView;
|
||||
my $db = $self->session->db;
|
||||
my $rowsPerPage = 25;
|
||||
my $locationsPerPage = $self->get('scheduleColumnsPerPage');
|
||||
|
||||
my @columnNames = map { "'col" . $_ . "'" } ( 1..$locationsPerPage );
|
||||
my $fieldList = join ',', @columnNames;
|
||||
my $dataColumns = join ",\n", map {
|
||||
'{key:' . $_ . ',sortable:false,label:"",formatter:formatViewScheduleItem}'
|
||||
} @columnNames;
|
||||
|
||||
return $self->processStyle(
|
||||
$self->processTemplate({
|
||||
backUrl => $self->getUrl,
|
||||
rowsPerPage => $rowsPerPage,
|
||||
dataColumns => $dataColumns,
|
||||
fieldList => $fieldList,
|
||||
dataSourceUrl => $self->getUrl('func=getScheduleDataJSON'),
|
||||
},$self->get('scheduleTemplateId')));
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -2248,6 +2342,31 @@ sub www_viewSubmissionQueue {
|
|||
|
||||
# fill the view submission queue template
|
||||
|
||||
|
||||
# fill the view submission template
|
||||
my $self = shift;
|
||||
return $self->session->privilege->insufficient() unless $self->canView;
|
||||
my $db = $self->session->db;
|
||||
my $rowsPerPage = 25;
|
||||
my $locationsPerPage = $self->get('scheduleColumnsPerPage');
|
||||
|
||||
my @columnNames = map { "'col" . $_ . "'" } ( 1..$locationsPerPage );
|
||||
my $fieldList = join ',', @columnNames;
|
||||
my $dataColumns = join ",\n", map {
|
||||
'{key:' . $_ . ',sortable:false,label:"",formatter:formatViewScheduleItem}'
|
||||
} @columnNames;
|
||||
|
||||
return $self->processStyle(
|
||||
$self->processTemplate({
|
||||
backUrl => $self->getUrl,
|
||||
rowsPerPage => $rowsPerPage,
|
||||
dataColumns => $dataColumns,
|
||||
fieldList => $fieldList,
|
||||
dataSourceUrl => $self->getUrl('func=getScheduleDataJSON'),
|
||||
},$self->get('scheduleTemplateId')));
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1902,6 +1902,42 @@ normal templates.|,
|
|||
context => q|Label for link to view submissions owned by current user.|,
|
||||
},
|
||||
|
||||
'event submission template' => {
|
||||
message => q|Event Submission Template|,
|
||||
lastUpdated => 1131394072,
|
||||
context => q|Label for the template that is used to submit events.|
|
||||
},
|
||||
|
||||
'event submission template help' => {
|
||||
message => q|This template is used for event submission, most of its contents is composed by the submission form asset based on the description given by the admin who created it.|,
|
||||
lastUpdated => 1131394072,
|
||||
context => q|Help text for the event submission form template.|
|
||||
},
|
||||
|
||||
'event submission queue template' => {
|
||||
message => q|Event Submission Queue Template|,
|
||||
lastUpdated => 1131394072,
|
||||
context => q|Label for the Event Submission Queue template.|
|
||||
},
|
||||
|
||||
'event submission queue template help' => {
|
||||
message => q|This is the template used to display the Event Submission Queue, used for both submitters and admin.|,
|
||||
lastUpdated => 1131394072,
|
||||
context => q|Help text for the Event SUbmission Queue Template.|
|
||||
},
|
||||
|
||||
'event submission form template' => {
|
||||
message => q|Event Submission Form Template|,
|
||||
lastUpdated => 1131394072,
|
||||
context => q|Label for the event submission form template.|
|
||||
},
|
||||
|
||||
'event submission form template help' => {
|
||||
message => q|This template is used to describe the event submission form which will be used by submitters to entger their information. This template consists of a few standard fields and a list of optional fields which are turned on by selecting them from the list.|,
|
||||
lastUpdated => 1131394072,
|
||||
context => q|Help text for the event submission form template.|
|
||||
},
|
||||
|
||||
# 'TODO' => {
|
||||
# message => q|TODO|,
|
||||
# lastUpdated => 1147050475,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue