Attachment #3447 for bug #4718




	// Scheduling functions
	//
	case 'scheduleForPublication':
	case 'setDatePublished':
	//
	// Payments
	//
	case 'waiveSubmissionFee':
	case 'waiveFastTrackFee':
	case 'waivePublicationFee':
		define('HANDLER_CLASS', 'SubmissionEditHandler');
		import('pages.sectionEditor.SubmissionEditHandler');
		break;

(-)a/pages/sectionEditor/SubmissionEditHandler.inc.php (-5 / +30 lines)

Lines 307-313 class SubmissionEditHandler extends SectionEditorHandler {	Link Here

307

		$completedPaymentDao =& DAORegistry::getDAO('OJSCompletedPaymentDAO');

307

		$completedPaymentDao =& DAORegistry::getDAO('OJSCompletedPaymentDAO');

308

309

		$publicationFeeEnabled = $paymentManager->publicationEnabled();

309

		$publicationFeeEnabled = $paymentManager->publicationEnabled();

310

		$templateMgr->assign('publicatonFeeEnabled',  $publicationFeeEnabled);

310

		$templateMgr->assign('publicationFeeEnabled',  $publicationFeeEnabled);

311

		if ( $publicationFeeEnabled ) {

311

		if ( $publicationFeeEnabled ) {

312

			$templateMgr->assign_by_ref('publicationPayment', $completedPaymentDao->getPublicationCompletedPayment ( $journal->getId(), $articleId ));

312

			$templateMgr->assign_by_ref('publicationPayment', $completedPaymentDao->getPublicationCompletedPayment ( $journal->getId(), $articleId ));

313

Lines 2306-2318 class SubmissionEditHandler extends SectionEditorHandler {	Link Here

2306

2307

/**

2307

/**

2308

	 * Schedule/unschedule an article for publication.

2308

	 * Schedule/unschedule an article for publication.

2309

	 * @param $args array

2310

	 * @param $request object

2309

*/

2311

*/

2310

	function scheduleForPublication($args) {

2312

	function scheduleForPublication($args, $request) {

2311

		$articleId = (int) array_shift($args);

2313

		$articleId = (int) array_shift($args);

2312

		$issueId = (int) Request::getUserVar('issueId');

2314

		$issueId = (int) $request->getUserVar('issueId');

2313

		$this->validate($articleId, SECTION_EDITOR_ACCESS_EDIT);

2315

		$this->validate($articleId, SECTION_EDITOR_ACCESS_EDIT);

2314

2316

2315

		$journal =& Request::getJournal();

2317

		$journal =& $request->getJournal();

2316

		$submission =& $this->submission;

2318

		$submission =& $this->submission;

2317

2319

2318

		$sectionEditorSubmissionDao =& DAORegistry::getDAO('SectionEditorSubmissionDAO');

2320

		$sectionEditorSubmissionDao =& DAORegistry::getDAO('SectionEditorSubmissionDAO');

Lines 2370-2376 class SubmissionEditHandler extends SectionEditorHandler {	Link Here

2370

2372

2371

		$sectionEditorSubmissionDao->updateSectionEditorSubmission($submission);

2373

		$sectionEditorSubmissionDao->updateSectionEditorSubmission($submission);

2372

2374

2373

		Request::redirect(null, null, 'submissionEditing', array($articleId), null, 'scheduling');

2375

		$request->redirect(null, null, 'submissionEditing', array($articleId), null, 'scheduling');

2376

2377

2378

/**

2379

	 * Set the publication date for a published article

2380

	 * @param $args array

2381

	 * @param $request object

2382

*/

2383

	function setDatePublished($args, $request) {

2384

		$articleId = (int) array_shift($args);

2385

		$issueId = (int) $request->getUserVar('issueId');

2386

		$this->validate($articleId, SECTION_EDITOR_ACCESS_EDIT);

2387

2388

		$journal =& $request->getJournal();

2389

		$submission =& $this->submission;

2390

2391

		$publishedArticleDao =& DAORegistry::getDAO('PublishedArticleDAO');

2392

		$publishedArticle =& $publishedArticleDao->getPublishedArticleByArticleId($articleId);

2393

		if ($publishedArticle) {

2394

			$datePublished = $request->getUserDateVar('datePublished');

2395

			$publishedArticle->setDatePublished($datePublished);

2396

			$publishedArticleDao->updatePublishedArticle($publishedArticle);

2397

2398

		$request->redirect(null, null, 'submissionEditing', array($articleId), null, 'scheduling');

2374

2399

2375

2400

2376

/**

2401

/**




	// Scheduling functions
	//
	case 'scheduleForPublication':
	case 'setDatePublished':
	 //
	 // Payments
	 //
	case 'waiveSubmissionFee':
	case 'waiveFastTrackFee':
	case 'waivePublicationFee':
		define('HANDLER_CLASS', 'SubmissionEditHandler');
		import('pages.sectionEditor.SubmissionEditHandler');
		break;

(-)a/plugins/importexport/quickSubmit/QuickSubmitForm.inc.php (-2 / +4 lines)

Lines 136-141 class QuickSubmitForm extends Form {	Link Here

136

137

);

137

);

138

139

		$this->readUserDateVars(array('datePublished'));

140

139

		$sectionDao =& DAORegistry::getDAO('SectionDAO');

141

		$sectionDao =& DAORegistry::getDAO('SectionDAO');

140

		$section =& $sectionDao->getSection($this->getData('sectionId'));

142

		$section =& $sectionDao->getSection($this->getData('sectionId'));

141

		if ($section && !$section->getAbstractsNotRequired()) {

143

		if ($section && !$section->getAbstractsNotRequired()) {

Lines 156-162 class QuickSubmitForm extends Form {	Link Here

156

158

157

		$temporaryFile = $temporaryFileManager->handleUpload($fileName, $user->getId());

159

		$temporaryFile = $temporaryFileManager->handleUpload($fileName, $user->getId());

158

160

159

		if($temporaryFile) {

161

		if ($temporaryFile) {

160

			return $temporaryFile->getId();

162

			return $temporaryFile->getId();

161

		} else {

163

		} else {

162

			return false;

164

			return false;

Lines 387-393 class QuickSubmitForm extends Form {	Link Here

387

				$publishedArticle = new PublishedArticle();

389

				$publishedArticle = new PublishedArticle();

388

				$publishedArticle->setId($submission->getId());

390

				$publishedArticle->setId($submission->getId());

389

				$publishedArticle->setIssueId($issueId);

391

				$publishedArticle->setIssueId($issueId);

390

				$publishedArticle->setDatePublished(Core::getCurrentDate());

392

				$publishedArticle->setDatePublished($this->getData('datePublished'));

391

				$publishedArticle->setSeq(REALLY_BIG_NUMBER);

393

				$publishedArticle->setSeq(REALLY_BIG_NUMBER);

392

				$publishedArticle->setViews(0);

394

				$publishedArticle->setViews(0);

393

				$publishedArticle->setAccessStatus(ARTICLE_ACCESS_ISSUE_DEFAULT);

395

				$publishedArticle->setAccessStatus(ARTICLE_ACCESS_ISSUE_DEFAULT);




		$form->readInputData();
		$formLocale = $form->getFormLocale();

		if ($request->getUserVar('addAuthor')) {
			$editData = true;
			$authors = $form->getData('authors');
			$authors[] = array();
			$form->setData('authors', $authors);
		} else if (($delAuthor = $request->getUserVar('delAuthor')) && count($delAuthor) == 1) {
			$editData = true;
			list($delAuthor) = array_keys($delAuthor);
			$delAuthor = (int) $delAuthor;

			if ($form->getData('primaryContact') == $delAuthor) {
				$form->setData('primaryContact', 0);
			}
		} else if ($request->getUserVar('moveAuthor')) {
			$editData = true;
			$moveAuthorDir = $request->getUserVar('moveAuthorDir');
			$moveAuthorDir = $moveAuthorDir == 'u' ? 'u' : 'd';
			$moveAuthorIndex = (int) $request->getUserVar('moveAuthorIndex');
			$authors = $form->getData('authors');

			if (!(($moveAuthorDir == 'u' && $moveAuthorIndex <= 0) || ($moveAuthorDir == 'd' && $moveAuthorIndex >= count($authors) - 1))) {

				}
			}
			$form->setData('authors', $authors);
		} else if ($request->getUserVar('uploadSubmissionFile')) {
			$editData = true;
			$tempFileId = $form->getData('tempFileId');
			$tempFileId[$formLocale] = $form->uploadSubmissionFile('submissionFile');
			$form->setData('tempFileId', $tempFileId);
		}

		if ($request->getUserVar('createAnother') && $form->validate()) {
			$form->execute();
			$request->redirect(null, 'manager', 'importexport', array('plugin', $this->getName()));
		} else if (!isset($editData) && $form->validate()) {
			$form->execute();
			$templateMgr->display($this->getTemplatePath() . 'submitSuccess.tpl');




			<td class="label" width="5%">
				<input type="radio" name="destination" id="destinationUnpublished" value="queue" {if not $publishToIssue} checked="checked"{/if}{if $enablePageNumber} onclick="document.getElementById('submit').pages.disabled = true;document.getElementById('submit').pagesHidden.value = document.getElementById('submit').pages.value; document.getElementById('submit').pages.value = '';"{/if}/>
			</td>
			<td colspan="2" class="value" width="95%">{fieldLabel name="destinationUnpublished" key="plugins.importexport.quickSubmit.leaveUnpublished"}</td>
		</tr>
		<tr valign="top">
			<td rowspan="2" class="label">
				<input type="radio" id="destinationIssue" name="destination" value="issue" {if $publishToIssue} checked="checked"{/if}{if $enablePageNumber} onclick="document.getElementById('submit').pages.disabled = false;document.getElementById('submit').pages.value = document.getElementById('submit').pagesHidden.value;"{/if}/>
			</td>
			<td width="20%" class="value">
				{fieldLabel name="destinationIssue" key="plugins.importexport.quickSubmit.addToExisting"}
			</td>
			<td class="value">
				<select name="issueId" id="issueId" size="1" class="selectMenu">{html_options options=$issueOptions selected=$issueNumber}</select>
			</td>
		</tr>
		<tr valign="top">
			<td class="label">
				<label for="issueId">{translate key="editor.issues.published"}</label>
			</td>
			<td class="value">
				{* Find good values for starting and ending year options *}
				{assign var=currentYear value=$smarty.now|date_format:"%Y"}
				{if $datePublished}
					{assign var=publishedYear value=$datePublished|date_format:"%Y"}
					{math|assign:"minYear" equation="min(x,y)-10" x=$publishedYear y=$currentYear}
					{math|assign:"maxYear" equation="max(x,y)+2" x=$publishedYear y=$currentYear}
				{else}
					{* No issue publication date info *}
					{math|assign:"minYear" equation="x-10" x=$currentYear}
					{math|assign:"maxYear" equation="x+2" x=$currentYear}
				{/if}
				{html_select_date prefix="datePublished" time=$datePublished|default:"---" all_extra="class=\"selectMenu\"" start_year=$minYear end_year=$maxYear year_empty="common.year"|translate month_empty="common.month"|translate day_empty="common.day"|translate}
			</td>
		</tr>
		{if $enablePageNumber}
			<tr valign="top">
				<td class="label">&nbsp;</td>
				<td colspan="2" class="value">
					{fieldLabel name="pages" key="editor.issues.pages"}&nbsp;
					<input name="pages" id="pages" {if $publishToIssue}value="{$pages|escape}" {else}disabled="disabled" {/if}size="20" maxlength="40" class="textField" />
					<input type="hidden" name="pagesHidden" value="{$pages|escape}" />




	<tr valign="top">
		<td class="label">{translate key="common.status"}</td>
		<td class="value">
			{if $issue->getPublished()}
				{translate key="editor.issues.published"}&nbsp;&nbsp;
				{* Find good values for starting and ending year options *}
				{assign var=publishedYear value=$issue->getDatePublished()|date_format:"%Y"}
				{assign var=currentYear value=$smarty.now|date_format:"%Y"}
				{if $datePublished}
					{assign var=publishedYear value=$datePublished|date_format:"%Y"}
					{math|assign:"minYear" equation="min(x,y)-10" x=$publishedYear y=$currentYear}
					{math|assign:"maxYear" equation="max(x,y)+2" x=$publishedYear y=$currentYear}
				{else}
					{* No issue publication date info *}
					{math|assign:"minYear" equation="x-10" x=$currentYear}
					{math|assign:"maxYear" equation="x+2" x=$currentYear}
				{/if}
				{html_select_date prefix="datePublished" time=$datePublished|default:"---" all_extra="class=\"selectMenu\"" start_year=$minYear end_year=$maxYear year_empty="-" month_empty="-" day_empty="-"}
			{else}
				{translate key="editor.issues.unpublished"}
			{/if}




<div id="scheduling">
<h3>{translate key="submission.scheduling"}</h3>

<table class="data" width="100%">
{if !$publicationFeeEnabled || $publicationPayment}
	<form action="{url op="scheduleForPublication" path=$submission->getId()}" method="post">
		<tr valign="top">
			<td width="25%" class="label">
				<label for="issueId">{translate key="editor.article.scheduleForPublication"}</label>
			</td>
			<td width="25%" class="value">
				{if $publishedArticle}
					{assign var=issueId value=$publishedArticle->getIssueId()}
				{else}
					{assign var=issueId value=0}
				{/if}
				<select name="issueId" id="issueId" class="selectMenu">
					<option value="">{translate key="editor.article.scheduleForPublication.toBeAssigned"}</option>
					{html_options options=$issueOptions|truncate:40:"..." selected=$issueId}
				</select>
			</td>
			<td width="50%" class="value">
				<input type="submit" value="{translate key="common.record"}" class="button defaultButton" />&nbsp;
				{if $issueId}
					{if $isEditor}
						<a href="{url op="issueToc" path=$issueId}" class="action">{translate key="issue.toc"}</a>
					{else}
						<a href="{url page="issue" op="view" path=$issueId}" class="action">{translate key="issue.toc"}</a>
					{/if}
				{/if}
			</td>
		</tr>
	</form>
	{if $publishedArticle}
		<form action="{url op="setDatePublished" path=$submission->getId()}" method="post">
			<tr valign="top">
				<td width="20%" class="label">
					<label for="issueId">{translate key="editor.issues.published"}</label>
				</td>
				<td class="value">
					{* Find good values for starting and ending year options *}
					{assign var=currentYear value=$smarty.now|date_format:"%Y"}
					{if $publishedArticle->getDatePublished()}
						{assign var=publishedYear value=$publishedArticle->getDatePublished()|date_format:"%Y"}
						{math|assign:"minYear" equation="min(x,y)-10" x=$publishedYear y=$currentYear}
						{math|assign:"maxYear" equation="max(x,y)+2" x=$publishedYear y=$currentYear}
					{else}
						{* No issue publication date info *}
						{math|assign:"minYear" equation="x-10" x=$currentYear}
						{math|assign:"maxYear" equation="x+2" x=$currentYear}
					{/if}
					{html_select_date prefix="datePublished" time=$publishedArticle->getDatePublished()|default:"---" all_extra="class=\"selectMenu\"" start_year=$minYear end_year=$maxYear year_empty="-" month_empty="-" day_empty="-"}
				</td>
				<td class="value">
					<input type="submit" value="{translate key="common.record"}" class="button defaultButton" />&nbsp;
				</td>
			</tr>
		</form>
	{/if}{* $publishedArticle *}
{else}
	<tr>
		<td>{translate key="editor.article.payment.publicationFeeNotPaid"}</td>
    	<td width="50%">
    		{translate key="editor.article.payment.publicationFeeNotPaid"}
    	</td>
		<td align="right">
			<form action="{url op="waivePublicationFee" path=$submission->getId()}" method="post">
			<input type="hidden" name="markAsPaid" value=1 />

			</form>
		</td>
		{if $isEditor}
			<td align="left">
				<form action="{url op="waivePublicationFee" path=$submission->getId()}" method="post">
					<input type="hidden" name="sendToScheduling" value=1 />
					<input type="submit" value="{translate key="payment.waive"}" class="button defaultButton" />&nbsp;
				</form>
			</td>	
		{/if}
	</tr>
	</table>
{/if}
</table>
</div>

(-)a/dbscripts/xml/ojs_schema.xml (-3 / +1 lines)

Lines 604-612	Link Here

604

		<field name="issue_id" type="I8">

604

		<field name="issue_id" type="I8">

605

			<NOTNULL/>

605

			<NOTNULL/>

606

		</field>

606

		</field>

607

		<field name="date_published" type="T">

607

		<field name="date_published" type="T"/>

608

			<NOTNULL/>

609

		</field>

610

		<field name="seq" type="F">

608

		<field name="seq" type="F">

611

			<NOTNULL/>

609

			<NOTNULL/>

612

			<DEFAULT VALUE="0"/>

610

			<DEFAULT VALUE="0"/>

Return to bug 4718