oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

migrate IOB viewReport to FormBuilder

Browse source
This commit is contained in:
Doug Bell 2011-02-02 17:27:12 -06:00
parent 603ad39e3b
commit 0a2a010a95
2 changed files with 49 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/WebGUI/Asset/Wobject/InOutBoard.pm
View file

@ -448,26 +448,26 @@ sub www_viewReport {
return "" unless ($self->session->user->isInGroup($self->reportViewerGroup));
my %var;
my $i18n = WebGUI::International->new($self->session,'Asset_InOutBoard');
my $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl, -method=>"GET");
my $f = WebGUI::FormBuilder->new($self->session, action=>$self->getUrl, method=>"GET");
my %changedBy = ();
$f->hidden(
$f->addField( "hidden",
-name=>"func",
-value=>"viewReport"
);
$f->hidden(
$f->addField( "hidden",
-name=>"doit",
-value=>"1"
);
my $startDate = $self->session->datetime->addToDate(time(),0,0,-15);
$startDate = $self->session->form->date("startDate") if ($self->session->form->process("doit"));
$f->date(
$f->addField( "date",
-name=>"startDate",
-label=>$i18n->get(16),
-hoverHelp=>$i18n->get('16 description'),
-value=>$startDate
);
my $endDate = $self->session->form->date("endDate");
$f->date(
$f->addField( "date",
-name=>"endDate",
-label=>$i18n->get(17),
-hoverHelp=>$i18n->get('17 description'),
@ -485,7 +485,7 @@ sub www_viewReport {
: $defaultDepartment eq ''
? 'and userProfileData.department IS NULL'
: 'and userProfileData.department='.$self->session->db->quote($defaultDepartment);
$f->selectBox(
$f->addField( "selectBox",
-name=>"selectDepartment",
-options=>\%depHash,
-value=>[ $defaultDepartment ],
@ -496,16 +496,16 @@ sub www_viewReport {
tie %paginHash, "Tie::IxHash"; ##Because default sort order is alpha
%paginHash = (50 => 50, 100 => 100, 300 => 300, 500 => 500, 1000 => 1000, 10_000 => 10_000,);
my $pageReportAfter = $self->session->form->process("reportPagination") || 50;
$f->selectBox(
$f->addField( "selectBox",
-name=>"reportPagination",
-options=>\%paginHash,
-value=>[ $pageReportAfter ],
-label=>$i18n->get(14),
-hoverHelp=>$i18n->get('14 description'),
);
$f->submit(-value=>$i18n->get('search','Asset'));
$f->addField( "submit", value=>$i18n->get('search','Asset'));
$var{'reportTitleLabel'} = $i18n->get('report title');
$var{'form'} = $f->print;
$var{'form'} = $f->toHtml;
my $url = $self->getUrl("func=viewReport;selectDepartment=".$defaultDepartment.";reportPagination=".$pageReportAfter.";startDate=".$self->session->form->process("startDate").";endDate=".$endDate.";doit=1");
if ($self->session->form->process("doit")) {
$var{showReport} = 1;

41
t/Asset/Wobject/InOutBoard.t
View file

@ -18,7 +18,7 @@ use WebGUI::Test;
use WebGUI::Test::MockAsset;
use WebGUI::Test::Mechanize;
use WebGUI::Session;
use Test::More tests => 19; # increment this value for each test you create
use Test::More tests => 27; # increment this value for each test you create
use Test::Deep;
use Data::Dumper;
@ -199,3 +199,42 @@ my $hasDelegate = $session->db->quickScalar(
);
ok( $hasDelegate, "delegate saved in db" );
#----------------------------------------------------------------------------
# selectDelegates
my $mech = WebGUI::Test::Mechanize->new( config => WebGUI::Test->file );
$mech->get_ok( '/' );
$mech->session->user({ userId => '3' });
# Add some input to report on
$session->db->write(
"insert into InOutBoard_statusLog (assetId,userId,createdBy,status,dateStamp,message) values (?,?,?,?,?,?)",
[$board->getId, $users[0]->getId, '3', "in", time, "No sleep till Brooklyn!" ],
);
$session->db->write(
"insert into InOutBoard_statusLog (assetId,userId,createdBy,status,dateStamp,message) values (?,?,?,?,?,?)",
[$board->getId, $users[1]->getId, '3', "out", time+1000, "Sleeping till Brooklyn!" ],
);
$mech->get_ok( $board->getUrl( 'func=viewReport' ) );
$mech->submit_form_ok( {
fields => {
},
}, "configure the report",
);
# Report was ok!
$mech->content_contains( "No sleep till Brooklyn!" );
$mech->content_contains( "Sleeping till Brooklyn!" );
$mech->submit_form_ok( {
fields => {
startDate => time + 100,
endDate => time + 2000,
},
}, "configure the report again",
);
# Report was ok!
$mech->content_lacks( "No sleep till Brooklyn!" );
$mech->content_contains( "Sleeping till Brooklyn!" );