[otrs-cvs] Survey/Kernel/Modules AgentSurvey.pm, 1.53, 1.54 PublicSurvey.pm, 1.28, 1.29
"CVS commits notifications of OTRS.org" <[email protected]>
| Newsgroups | gmane.comp.otrs.cvs |
|---|---|
| Message-ID | <[email protected]> |
Comments:
Update of /home/cvs/Survey/Kernel/Modules
In directory lancelot:/tmp/cvs-serv22813/Kernel/Modules
Modified Files:
AgentSurvey.pm PublicSurvey.pm
Log Message:
Removed codemarkers.
Author: jh
Index: AgentSurvey.pm
===================================================================
RCS file: /home/cvs/Survey/Kernel/Modules/AgentSurvey.pm,v
retrieving revision 1.53
retrieving revision 1.54
diff -2 -u -d -r1.53 -r1.54
--- AgentSurvey.pm 20 Nov 2012 19:11:52 -0000 1.53
+++ AgentSurvey.pm 21 Nov 2012 10:59:53 -0000 1.54
@@ -325,7 +325,4 @@
}
- # ---
- # AnswerRequired
- # ---
my $RequiredText = '';
if ( $Question->{AnswerRequired} ) {
@@ -334,18 +331,10 @@
}
- # ---
-
$Self->{LayoutObject}->Block(
Name => 'StatsDetailQuestion',
Data => {
%{$Question},
- Class => $Class,
-
- # ---
- # AnswerRequired
- # ---
+ Class => $Class,
RequiredText => $RequiredText,
-
- # ---
},
);
Author: jh
Index: PublicSurvey.pm
===================================================================
RCS file: /home/cvs/Survey/Kernel/Modules/PublicSurvey.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -2 -u -d -r1.28 -r1.29
--- PublicSurvey.pm 20 Nov 2012 19:12:09 -0000 1.28
+++ PublicSurvey.pm 21 Nov 2012 10:59:54 -0000 1.29
@@ -48,13 +48,8 @@
my $Output;
- # ---
- # AnswerRequired
- # ---
my %Answers;
my %Errors;
my @QuestionList;
- # ---
-
# ------------------------------------------------------------ #
# public survey vote
@@ -66,86 +61,4 @@
@QuestionList = $Self->{SurveyObject}->QuestionList( SurveyID => $Survey{SurveyID} );
- # ---
- # AnswerRequired
- # ---
- # for my $Question (@QuestionList) {
- # if ( $Question->{Type} eq 'YesNo' ) {
- # my $PublicSurveyVote1 = $Self->{ParamObject}->GetParam(
- # Param => "PublicSurveyVote1[$Question->{QuestionID}]"
- # );
- # $Self->{SurveyObject}->PublicAnswerSave(
- # PublicSurveyKey => $PublicSurveyKey,
- # QuestionID => $Question->{QuestionID},
- # VoteValue => $PublicSurveyVote1,
- # );
- # }
- # elsif ( $Question->{Type} eq 'Radio' ) {
- # my $PublicSurveyVote2 = $Self->{ParamObject}->GetParam(
- # Param => "PublicSurveyVote2[$Question->{QuestionID}]"
- # );
- # $Self->{SurveyObject}->PublicAnswerSave(
- # PublicSurveyKey => $PublicSurveyKey,
- # QuestionID => $Question->{QuestionID},
- # VoteValue => $PublicSurveyVote2,
- # );
- # }
- # elsif ( $Question->{Type} eq 'Checkbox' ) {
- # my @AnswerList = $Self->{SurveyObject}->AnswerList(
- # QuestionID => $Question->{QuestionID}
- # );
- # for my $Answer (@AnswerList) {
- # my $PublicSurveyVote3 = $Self->{ParamObject}->GetParam(
- # Param => "PublicSurveyVote3[$Answer->{AnswerID}]"
- # );
- # if ( $PublicSurveyVote3 && $PublicSurveyVote3 eq 'Yes' ) {
- # $Self->{SurveyObject}->PublicAnswerSave(
- # PublicSurveyKey => $PublicSurveyKey,
- # QuestionID => $Question->{QuestionID},
- # VoteValue => $Answer->{AnswerID},
- # );
- # }
- # }
- # }
- # elsif ( $Question->{Type} eq 'Textarea' ) {
- # my $PublicSurveyVote4 = $Self->{ParamObject}->GetParam(
- # Param => "PublicSurveyVote4[$Question->{QuestionID}]"
- # );
- #
- # # check if rich text is enabled
- # if ( $Self->{LayoutObject}->{BrowserRichText} ) {
- # $PublicSurveyVote4
- # = ( length $PublicSurveyVote4 )
- # ? "\$html/text\$ $PublicSurveyVote4"
- # : '';
- # }
- #
- # $Self->{SurveyObject}->PublicAnswerSave(
- # PublicSurveyKey => $PublicSurveyKey,
- # QuestionID => $Question->{QuestionID},
- # VoteValue => $PublicSurveyVote4,
- # );
- # }
- # }
- # $Self->{SurveyObject}->PublicSurveyInvalidSet( PublicSurveyKey => $PublicSurveyKey );
- # }
- # $Output = $Self->{LayoutObject}->CustomerHeader( Title => 'Survey' );
- #
- # # print the main table.
- # $Self->{LayoutObject}->Block(
- # Name => 'PublicSurveyMessage',
- # Data => {
- # MessageType => 'Survey Information',
- # MessageHeader => 'Thank you for your feedback.',
- # Message => 'The survey is finished.',
- # },
- # );
- #
- # $Output .= $Self->{LayoutObject}->Output(
- # TemplateFile => 'PublicSurvey',
- # Data => {%Param},
- # );
- # $Output .= $Self->{LayoutObject}->CustomerFooter();
- # return $Output;
-
for my $Question (@QuestionList) {
if ( $Question->{Type} eq 'YesNo' ) {
@@ -297,6 +210,4 @@
}
}
-
- # ---
}
@@ -407,7 +318,4 @@
}
- # ---
- # AnswerRequired
- # ---
my $RequiredText = '';
if ( $Question->{AnswerRequired} ) {
@@ -416,18 +324,10 @@
}
- # ---
-
$Self->{LayoutObject}->Block(
Name => 'PublicSurveyVoteQuestion',
Data => {
%{$Question},
- Class => $Class,
-
- # ---
- # AnswerRequired
- # ---
+ Class => $Class,
RequiredText => $RequiredText,
-
- # ---
},
);
@@ -540,21 +440,13 @@
);
- # ---
- # AnswerRequired
- # ---
- # my @QuestionList = $Self->{SurveyObject}->QuestionList( SurveyID => $Survey{SurveyID} );
- # If we had errors, @QuestionList is already filled, so let's save a SQL query
+ # If we had errors, @QuestionList is already filled, so let's save a SQL query
if ( !@QuestionList ) {
@QuestionList = $Self->{SurveyObject}->QuestionList( SurveyID => $Survey{SurveyID} );
}
- # ---
for my $Question (@QuestionList) {
$Self->{LayoutObject}->Block( Name => 'PublicQuestions' );
- # ---
- # AnswerRequired
- # ---
my $Class = '';
my $RequiredText = '';
@@ -627,10 +519,6 @@
}
- # ---
if ( $Question->{Type} eq 'YesNo' ) {
- # ---
- # AnswerRequired
- # ---
my %Selected = (
YesSelected => ( $Answers{ $Question->{QuestionID} } eq 'Yes' )
@@ -642,12 +530,6 @@
);
- # ---
$Self->{LayoutObject}->Block(
Name => 'PublicAnswerYesNo',
-
- # ---
- # AnswerRequired
- # ---
- # Data => $Question,
Data => {
%{$Question},
@@ -657,6 +539,4 @@
RequiredText => $RequiredText,
}
-
- # ---
);
}
@@ -664,9 +544,4 @@
$Self->{LayoutObject}->Block(
Name => 'PublicAnswerRadio',
-
- # ---
- # AnswerRequired
- # ---
- # Data => $Question,
Data => {
%{$Question},
@@ -675,6 +550,4 @@
RequiredText => $RequiredText,
}
-
- # ---
);
my @AnswerList = $Self->{SurveyObject}->AnswerList(
@@ -683,26 +556,14 @@
for my $Answer (@AnswerList) {
- # ---
- # AnswerRequired
- # ---
my $Selected = '';
if ( $Answers{ $Question->{QuestionID} } eq $Answer->{AnswerID} ) {
$Selected = 'checked="checked"';
}
-
- # ---
$Self->{LayoutObject}->Block(
Name => 'PublicAnswerRadiob',
-
- # ---
- # AnswerRequired
- # ---
- # Data => $Answer,
Data => {
%{$Answer},
AnswerSelected => $Selected,
},
-
- # ---
);
}
@@ -711,9 +572,4 @@
$Self->{LayoutObject}->Block(
Name => 'PublicAnswerCheckbox',
-
- # ---
- # AnswerRequired
- # ---
- # Data => $Question,
Data => {
%{$Question},
@@ -722,6 +578,4 @@
RequiredText => $RequiredText,
}
-
- # ---
);
my @AnswerList = $Self->{SurveyObject}->AnswerList(
@@ -729,8 +583,4 @@
);
for my $Answer (@AnswerList) {
-
- # ---
- # AnswerRequired
- # ---
my $Selected = '';
if (
@@ -744,38 +594,18 @@
$Selected = 'checked="checked"';
}
-
- # ---
$Self->{LayoutObject}->Block(
Name => 'PublicAnswerCheckboxb',
-
- # ---
- # AnswerRequired
- # ---
- # Data => $Answer,
Data => {
%{$Answer},
AnswerSelected => $Selected,
},
-
- # ---
);
}
}
elsif ( $Question->{Type} eq 'Textarea' ) {
-
- # ---
- # AnswerRequired
- # ---
my $Value = $Answers{ $Question->{QuestionID} } || '';
$Value =~ s/^\$html\/text\$\s//;
-
- # ---
$Self->{LayoutObject}->Block(
Name => 'PublicAnswerTextarea',
-
- # ---
- # AnswerRequired
- # ---
- # Data => $Question,
Data => {
%{$Question},
@@ -785,6 +615,4 @@
Value => $Value,
}
-
- # ---
);
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log