Skip to content

Commit

Permalink
Dev: import and copy, design
Browse files Browse the repository at this point in the history
  • Loading branch information
louis committed Sep 22, 2015
1 parent ed57a53 commit 10f8184
Show file tree
Hide file tree
Showing 2 changed files with 190 additions and 142 deletions.
126 changes: 71 additions & 55 deletions application/views/admin/survey/copySurvey_view.php
@@ -1,64 +1,80 @@
<div class='header ui-widget-header'><?php eT("Copy survey"); ?></div>
<div class='messagebox ui-corner-all'>
<?php
/**
* Render the result of the survey copy action
*
*/
?>

<?php if (isset($aImportResults['error']) && $aImportResults['error']!=false)
<!-- Copy Error -->
<?php if (isset($aImportResults['error']) && $aImportResults['error']!=false): ?>
<div class="jumbotron message-box message-box-error">
<h2 ><?php eT("Copy survey"); ?></h2>
<p class="lead danger"><?php eT("Error"); ?></p>
<p><?php echo $aImportResults['error']; ?></p>
<p>
<input type='submit' class="btn btn-default btn-large" value='<?php eT("Main Admin Screen"); ?>' onclick="window.open('<?php echo $this->createUrl('admin'); ?>', '_top')" />
<?php $importerror = true; ?>
</p>
</div>
<?php else: ?>

<!-- Copy success -->
<div class="jumbotron message-box ">
<h2> <?php eT("Success"); ?></h2>

<p class="lead"><?php eT("Survey import summary"); ?></p>
<p>
<ul style="text-align:left;">
<li><?php eT("Surveys"); ?>: <?php echo $aImportResults['surveys']; ?></li>
<li><?php eT("Languages"); ?>: <?php echo $aImportResults['languages']; ?></li>
<li><?php eT("Question groups"); ?>: <?php echo $aImportResults['groups']; ?></li>
<li><?php eT("Questions"); ?>: <?php echo $aImportResults['questions']; ?></li>
<li><?php eT("Answers"); ?>: <?php echo $aImportResults['answers']; ?></li>
<?php if (isset($aImportResults['subquestions']))
{ ?>
<div class='warningheader'><?php eT("Error"); ?></div><br />
<?php echo $aImportResults['error']; ?><br /><br />
<input type='submit' value='<?php eT("Main Admin Screen"); ?>' onclick="window.open('<?php echo $this->createUrl('admin'); ?>', '_top')" />
<?php $importerror = true;
}

if (!$importerror)
<li><?php eT("Subquestions"); ?>: <?php echo $aImportResults['subquestions']; ?></li>
<?php }
if (isset($aImportResults['defaultvalues']))
{ ?>
<div class='successheader'><?php eT("Success"); ?></div><br /><br />

<strong><?php eT("Survey import summary"); ?></strong><br />


<ul style="text-align:left;">
<li><?php eT("Surveys"); ?>: <?php echo $aImportResults['surveys']; ?></li>
<li><?php eT("Languages"); ?>: <?php echo $aImportResults['languages']; ?></li>
<li><?php eT("Question groups"); ?>: <?php echo $aImportResults['groups']; ?></li>
<li><?php eT("Questions"); ?>: <?php echo $aImportResults['questions']; ?></li>
<li><?php eT("Answers"); ?>: <?php echo $aImportResults['answers']; ?></li>
<?php if (isset($aImportResults['subquestions']))
{ ?>
<li><?php eT("Subquestions"); ?>: <?php echo $aImportResults['subquestions']; ?></li>
<?php }
if (isset($aImportResults['defaultvalues']))
{ ?>
<li><?php eT("Default answers"); ?>: <?php echo $aImportResults['defaultvalues']; ?></li>
<?php }
if (isset($aImportResults['conditions']))
{ ?>
<li><?php eT("Condition"); ?>: <?php echo $aImportResults['conditions']; ?></li>
<?php }
if (isset($aImportResults['labelsets']))
{ ?>
<li><?php eT("Label sets"); ?>: <?php echo $aImportResults['labelsets']; ?></li>
<?php }
if (isset($aImportResults['deniedcountls']) && $aImportResults['deniedcountls']>0)
{ ?>
<li><?php eT("Not imported label sets"); ?>: <?php echo $aImportResults['deniedcountls']; eT("(Label sets were not imported since you do not have the permission to create new label sets.)"); ?></li>
<?php } ?>
<li><?php eT("Question attributes"); ?>: <?php echo $aImportResults['question_attributes']; ?></li>
<li><?php eT("Assessments"); ?>: <?php echo $aImportResults['assessments']; ?></li>
<li><?php eT("Quotas"); ?>: <?php echo $aImportResults['quota']; ?> (<?php echo $aImportResults['quotamembers']; eT("quota members"); eT("and"); echo $aImportResults['quotals']; eT("quota language settings"); ?>)</li></ul><br />

<?php if (count($aImportResults['importwarnings'])>0)
{ ?>
<div class='warningheader'><?php eT("Warnings"); ?>:</div>
<li><?php eT("Default answers"); ?>: <?php echo $aImportResults['defaultvalues']; ?></li>
<?php }
if (isset($aImportResults['conditions']))
{ ?>
<li><?php eT("Condition"); ?>: <?php echo $aImportResults['conditions']; ?></li>
<?php }
if (isset($aImportResults['labelsets']))
{ ?>
<li><?php eT("Label sets"); ?>: <?php echo $aImportResults['labelsets']; ?></li>
<?php }
if (isset($aImportResults['deniedcountls']) && $aImportResults['deniedcountls']>0)
{ ?>
<li><?php eT("Not imported label sets"); ?>: <?php echo $aImportResults['deniedcountls']; eT("(Label sets were not imported since you do not have the permission to create new label sets.)"); ?></li>
<?php } ?>
<li><?php eT("Question attributes"); ?>: <?php echo $aImportResults['question_attributes']; ?></li>
<li><?php eT("Assessments"); ?>: <?php echo $aImportResults['assessments']; ?></li>
<li><?php eT("Quotas"); ?>: <?php echo $aImportResults['quota']; ?> (<?php echo $aImportResults['quotamembers']; eT("quota members"); eT("and"); echo $aImportResults['quotals']; eT("quota language settings"); ?>)</li></ul><br />
</p>

<!-- Warnings -->
<?php if (count($aImportResults['importwarnings'])>0):?>
<h2 class='text-warning'><?php eT("Warnings"); ?>:</h2>
<p>
<ul style="text-align:left;">
<?php foreach ($aImportResults['importwarnings'] as $warning)
{ ?>
<li><?php echo $warning; ?></li>
<?php } ?>
</ul><br />
<?php } ?>

<strong><?php eT("Copy of survey is completed."); ?></strong>
<a href='<?php echo $this->createUrl("admin/survey/sa/view/".$aImportResults['newsid']); ?>'>
<?php eT("Go to survey"); ?></a>
<?php } ?>
</div>
</p>
<?php endif; ?>

<p><strong><?php eT("Copy of survey is completed."); ?></strong></p>

<p>
<a class="btn btn-default btn-large" href='<?php echo $this->createUrl("admin/survey/sa/view/".$aImportResults['newsid']); ?>'>
<?php eT("Go to survey"); ?>
</a>
</p>

</div>
<?php endif; ?>
206 changes: 119 additions & 87 deletions application/views/admin/survey/importSurvey_view.php
@@ -1,98 +1,130 @@
<div class='header ui-widget-header'><?php echo $sHeader;?></div>
<div class='messagebox ui-corner-all'>
<?php
if ($bFailed){ ?>
<div class='errorheader'><?php eT("Error");?></div>
<?php echo $sErrorMessage; ?><br /><br />
<input type='submit' value='<?php eT("Main Admin Screen");?>' onclick="window.open('<?php echo $this->createUrl('/admin');?>', '_top')">
<input type='submit' value='<?php eT("Import again");?>' onclick="window.open('<?php echo $this->createUrl('admin/survey/sa/newsurvey#import');?>', '_top')"><br /><br /></div>
<?php } else
{?>
<div class='successheader'><?php eT("Success");?></div>&nbsp;<br />
<?php eT("File upload succeeded.");?> <?php eT("Reading file..");?><br />
<?php if (isset($aImportResults['error']) && $aImportResults['error']!=false)
{?>
<div class='warningheader'><?php eT("Error");?></div><br />
<?php
if(is_array($aImportResults['error']))
{
foreach($aImportResults['error'] as $error)
echo $error."<br/>";
} else
{
echo $aImportResults['error'];
}
?><br /><br />
<input type='submit' value='<?php eT("Main Admin Screen");?>' onclick="window.open('<?php echo $this->createUrl('/admin');?>', '_top')" />
<?php } else
{?>
<?php
/**
* Render the result of the import survey action
*/
?>


<br /><div class='successheader'><?php eT("Success");?></div>
<strong><?php echo $sSummaryHeader; ?></strong><br />
<!-- Import Failed -->
<?php if ($bFailed):?>

<ul style="text-align:left;">
<li><?php eT("Surveys");?>: <?php echo $aImportResults['surveys'];?></li>
<li><?php eT("Languages");?>: <?php echo $aImportResults['languages'];?></li>
<li><?php eT("Question groups");?>: <?php echo $aImportResults['groups'];?></li>
<li><?php eT("Questions");?>: <?php echo $aImportResults['questions'];?></li>
<li><?php eT("Question attributes");?>: <?php echo $aImportResults['question_attributes'];?></li>
<li><?php eT("Answers");?>: <?php echo $aImportResults['answers'];?></li>
<?php if (isset($aImportResults['subquestions']))
{?>
<li><?php eT("Subquestions");?>: <?php echo $aImportResults['subquestions'];?></li>
<?php }
if (isset($aImportResults['defaultvalues']))
{?>
<li><?php eT("Default answers");?>: <?php echo $aImportResults['defaultvalues'];?></li>
<?php }
if (isset($aImportResults['conditions']))
{?>
<li><?php eT("Condition");?>: <?php echo $aImportResults['conditions'];?></li>
<?php }
if (isset($aImportResults['labelsets']))
{?>
<li><?php eT("Label sets");?>: <?php echo $aImportResults['labelsets'];?></li>
<?php }
if (isset($aImportResults['deniedcountls']) && $aImportResults['deniedcountls']>0)
{?>
<li><?php eT("Not imported label sets");?>: <?php echo $aImportResults['deniedcountls'];?> <?php eT("(Label sets were not imported since you do not have the permission to create new label sets.)"); ?> </li>
<?php }?>
<li><?php eT("Assessments");?>: <?php echo $aImportResults['assessments'];?></li>
<li><?php eT("Quotas");?>: <?php echo $aImportResults['quota'];?> (<?php echo $aImportResults['quotamembers']?> <?php eT("quota members");?> <?php eT("and");?> <?php echo $aImportResults['quotals']?> <?php eT("quota language settings"); ?></li>
<div class="jumbotron message-box message-box-error">
<h2 class="danger"><?php echo $sHeader;?></h2>
<p class="lead danger">
<?php eT("Error"); ?>
</p>

<!-- error message -->
<p>
<?php echo $sErrorMessage; ?>
</p>

<!-- buttons -->
<p>
<input type='submit' class="btn btn-default btn-large" value='<?php eT("Main Admin Screen"); ?>' onclick="window.open('<?php echo $this->createUrl('admin'); ?>', '_top')" />
</p>
</div>

</ul>
<?php
if (isset($aImportResults['responses']))
{?>
<!-- Import success but errors -->
<?php elseif ( isset($aImportResults['error']) && $aImportResults['error']!=false ): ?>

<div class="jumbotron message-box message-box-error">
<h2 class="text-success"> <?php eT("Success"); ?></h2>
<p class="lead"><?php eT("File upload succeeded.");?> </p>
<h2 class="warning"><?php eT("Error");?></h2>

<!-- errors -->
<?php
if(is_array($aImportResults['error']))
{
foreach($aImportResults['error'] as $error)
echo '<p>'.$error."<p/>";
}
else
{
echo '<p>'.$aImportResults['error'].'</p>';
}
?>

<!-- buttons -->
<p>
<input type='submit' value='<?php eT("Main Admin Screen");?>' class="btn btn-large btn-default" onclick="window.open('<?php echo $this->createUrl('/admin');?>', '_top')" />
</p>

</div>

<!-- Success -->
<?php else:?>
<div class="jumbotron message-box ">
<h2 class="text-success"><?php eT("Success"); ?></h2>

<p class="lead"><?php echo $sSummaryHeader; ?></p>

<!-- Import result messages -->
<p>
<ul class="list-unstyled">
<li><?php eT("Surveys");?>: <?php echo $aImportResults['surveys'];?></li>
<li><?php eT("Languages");?>: <?php echo $aImportResults['languages'];?></li>
<li><?php eT("Question groups");?>: <?php echo $aImportResults['groups'];?></li>
<li><?php eT("Questions");?>: <?php echo $aImportResults['questions'];?></li>
<li><?php eT("Question attributes");?>: <?php echo $aImportResults['question_attributes'];?></li>
<li><?php eT("Answers");?>: <?php echo $aImportResults['answers'];?></li>
<?php if (isset($aImportResults['subquestions']))
{?>
<li><?php eT("Subquestions");?>: <?php echo $aImportResults['subquestions'];?></li>
<?php }
if (isset($aImportResults['defaultvalues']))
{?>
<li><?php eT("Default answers");?>: <?php echo $aImportResults['defaultvalues'];?></li>
<?php }
if (isset($aImportResults['conditions']))
{?>
<li><?php eT("Condition");?>: <?php echo $aImportResults['conditions'];?></li>
<?php }
if (isset($aImportResults['labelsets']))
{?>
<li><?php eT("Label sets");?>: <?php echo $aImportResults['labelsets'];?></li>
<?php }
if (isset($aImportResults['deniedcountls']) && $aImportResults['deniedcountls']>0)
{?>
<li><?php eT("Not imported label sets");?>: <?php echo $aImportResults['deniedcountls'];?> <?php eT("(Label sets were not imported since you do not have the permission to create new label sets.)"); ?> </li>
<?php }?>
<li><?php eT("Assessments");?>: <?php echo $aImportResults['assessments'];?></li>
<li><?php eT("Quotas");?>: <?php echo $aImportResults['quota'];?> (<?php echo $aImportResults['quotamembers']?> <?php eT("quota members");?> <?php eT("and");?> <?php echo $aImportResults['quotals']?> <?php eT("quota language settings"); ?></li>
</ul>
</p>

<!-- Response import summary -->
<?php if (isset($aImportResults['responses'])): ?>
<strong><?php eT("Response import summary"); ?></strong><br />
<ul>
<ul class="list-unstyled">
<li><?php eT("Responses");?>: <?php echo $aImportResults['responses'];?></li>
<?php }?>
</ul>
<br />
<?php
if (count($aImportResults['importwarnings'])>0)
{ ?>
<div class='warningheader'><?php eT("Warnings");?>:</div>
<ul style="text-align:left;">
</ul>
<?php endif;?>

<!-- Warnings -->
<?php if (count($aImportResults['importwarnings'])>0): ?>
<h2 class="warning"><?php eT("Warnings");?>:</h2>
<ul class="list-unstyled">
<?php
foreach ($aImportResults['importwarnings'] as $warning)
{ ?>
<li><?php echo $warning; ?></li>
<?php
} ?>
</ul><br />
<?php }
if ($action == 'importsurvey')
{?>
<strong><?php eT("Import of survey is completed.");?></strong><br />
<?php }
elseif($action == 'copysurvey')
{?>
<strong><?php eT("Copy of survey is completed.");?></strong><br />
<?php } ?>
<br>
<input type='submit' value='<?php eT("Go to survey");?>' onclick="window.open('<?php echo $sLink; ?>', '_top')"><br /><br />
<?php } ?>
</div><br />
<?php }?>
</ul>
<?php endif; ?>

<!-- Import Result -->
<?php if ($action == 'importsurvey'): ?>
<p class="text-info"><?php eT("Import of survey is completed.");?></p>
<?php elseif($action == 'copysurvey'): ?>
<p class="text-info"><?php eT("Copy of survey is completed.");?></p>
<?php endif; ?>

<!-- Buttons -->
<p>
<input type='submit' class="btn btn-default btn-large" value='<?php eT("Go to survey");?>' onclick="window.open('<?php echo $sLink; ?>', '_top')"><br /><br />
</p>
</div>
<?php endif;?>

0 comments on commit 10f8184

Please sign in to comment.