View | Details | Raw Unified | Return to bug 2683 | Differences between
and this patch

Collapse All | Expand All

(-)classes/submission/sectionEditor/SectionEditorSubmission.inc.php (+21 lines)
 Lines 953-958    Link Here 
953
				strtotime($this->getCopyeditorDateAcknowledged()) : 0;
953
				strtotime($this->getCopyeditorDateAcknowledged()) : 0;
954
			$dateLastCopyeditor = max($dateCopyeditorNotified, $dateCopyeditorUnderway);
954
			$dateLastCopyeditor = max($dateCopyeditorNotified, $dateCopyeditorUnderway);
955
955
956
			// If the Copyeditor has not been notified, highlight.
957
			if (!$dateCopyeditorNotified) return $highlightClass;
958
956
			// Check if the copyeditor is overdue on round 1
959
			// Check if the copyeditor is overdue on round 1
957
			if (	$dateLastCopyeditor &&
960
			if (	$dateLastCopyeditor &&
958
				!$dateCopyeditorCompleted &&
961
				!$dateCopyeditorCompleted &&
 Lines 973-978    Link Here 
973
				strtotime($this->getCopyeditorDateAuthorAcknowledged()) : 0;
976
				strtotime($this->getCopyeditorDateAuthorAcknowledged()) : 0;
974
			$dateLastCopyeditorAuthor = max($dateCopyeditorAuthorNotified, $dateCopyeditorAuthorUnderway);
977
			$dateLastCopyeditorAuthor = max($dateCopyeditorAuthorNotified, $dateCopyeditorAuthorUnderway);
975
978
979
			// Check if round 2 is awaiting notification.
980
			if ($dateCopyeditorAcknowledged && !$dateCopyeditorAuthorNotified) return $highlightClass;
981
976
			// Check if acknowledgement is overdue for CE round 2
982
			// Check if acknowledgement is overdue for CE round 2
977
			if ($dateCopyeditorAuthorCompleted && !$dateCopyeditorAuthorAcknowledged) return $highlightClass;
983
			if ($dateCopyeditorAuthorCompleted && !$dateCopyeditorAuthorAcknowledged) return $highlightClass;
978
984
 Lines 991-996    Link Here 
991
				strtotime($this->getCopyeditorDateFinalCompleted()) : 0;
997
				strtotime($this->getCopyeditorDateFinalCompleted()) : 0;
992
			$dateLastCopyeditorFinal = max($dateCopyeditorFinalNotified, $dateCopyeditorUnderway);
998
			$dateLastCopyeditorFinal = max($dateCopyeditorFinalNotified, $dateCopyeditorUnderway);
993
999
1000
			// Check if round 3 is awaiting notification.
1001
			if ($dateCopyeditorAuthorAcknowledged && !$dateCopyeditorFinalNotified) return $highlightClass;
1002
994
			// Check if copyeditor is overdue on round 3
1003
			// Check if copyeditor is overdue on round 3
995
			if (	$dateLastCopyeditorFinal &&
1004
			if (	$dateLastCopyeditorFinal &&
996
				!$dateCopyeditorFinalCompleted &&
1005
				!$dateCopyeditorFinalCompleted &&
 Lines 1013-1018    Link Here 
1013
				strtotime($layoutAssignment->getDateAcknowledged()) : 0;
1022
				strtotime($layoutAssignment->getDateAcknowledged()) : 0;
1014
			$dateLastLayout = max($dateLayoutNotified, $dateLayoutUnderway);
1023
			$dateLastLayout = max($dateLayoutNotified, $dateLayoutUnderway);
1015
1024
1025
			// Check if Layout Editor needs to be notified.
1026
			if ($dateLastCopyeditorFinal && !$dateLayoutNotified) return $highlightClass;
1027
1016
			// Check if layout editor is overdue
1028
			// Check if layout editor is overdue
1017
			if (	$dateLastLayout &&
1029
			if (	$dateLastLayout &&
1018
				!$dateLayoutCompleted &&
1030
				!$dateLayoutCompleted &&
 Lines 1036-1041    Link Here 
1036
				strtotime($proofAssignment->getDateAuthorAcknowledged()) : 0;
1048
				strtotime($proofAssignment->getDateAuthorAcknowledged()) : 0;
1037
			$dateLastAuthor = max($dateAuthorNotified, $dateAuthorUnderway);
1049
			$dateLastAuthor = max($dateAuthorNotified, $dateAuthorUnderway);
1038
1050
1051
			// Check if the author is awaiting proofreading notification.
1052
			if ($dateLayoutAcknowledged && !$dateAuthorNotified) return $highlightClass;
1053
1039
			// Check if the author is overdue on round 1 of proofreading
1054
			// Check if the author is overdue on round 1 of proofreading
1040
			if (	$dateLastAuthor &&
1055
			if (	$dateLastAuthor &&
1041
				!$dateAuthorCompleted &&
1056
				!$dateAuthorCompleted &&
 Lines 1056-1061    Link Here 
1056
				strtotime($proofAssignment->getDateProofreaderAcknowledged()) : 0;
1071
				strtotime($proofAssignment->getDateProofreaderAcknowledged()) : 0;
1057
			$dateLastProofreader = max($dateProofreaderNotified, $dateProofreaderUnderway);
1072
			$dateLastProofreader = max($dateProofreaderNotified, $dateProofreaderUnderway);
1058
1073
1074
			// Check if the proofreader is awaiting notification.
1075
			if ($dateAuthorAcknowledged && !$dateProofreaderNotified) return $highlightClass;
1076
1059
			// Check if acknowledgement is overdue for proofreading round 2
1077
			// Check if acknowledgement is overdue for proofreading round 2
1060
			if ($dateProofreaderCompleted && !$dateProofreaderAcknowledged) return $highlightClass;
1078
			if ($dateProofreaderCompleted && !$dateProofreaderAcknowledged) return $highlightClass;
1061
1079
 Lines 1074-1079    Link Here 
1074
				strtotime($proofAssignment->getDateLayoutEditorCompleted()) : 0;
1092
				strtotime($proofAssignment->getDateLayoutEditorCompleted()) : 0;
1075
			$dateLastLayoutEditor = max($dateLayoutEditorNotified, $dateCopyeditorUnderway);
1093
			$dateLastLayoutEditor = max($dateLayoutEditorNotified, $dateCopyeditorUnderway);
1076
1094
1095
			// Check if the layout editor is awaiting notification.
1096
			if ($dateProofreaderAcknowledged && !$dateLayoutEditorNotified) return $highlightClass;
1097
1077
			// Check if proofreader is overdue on round 3 of proofreading
1098
			// Check if proofreader is overdue on round 3 of proofreading
1078
			if (	$dateLastLayoutEditor &&
1099
			if (	$dateLastLayoutEditor &&
1079
				!$dateLayoutEditorCompleted &&
1100
				!$dateLayoutEditorCompleted &&

Return to bug 2683