Workflow enhancements: restart, archive and edit workflow

resources/admin/classes/domain/AcquisitionType.php

@@ -64,7 +64,16 @@ public function getNumberOfChildren(){
 
 	}
 
+    public function getAcquisitionTypeIDByName($name) {
+        $query = "SELECT acquisitionTypeID from AcquisitionType WHERE UPPER(shortName) = '" . strtoupper($name) . "';";
+
+		$result = $this->db->processQuery($query, 'assoc');
+
+		return $result['acquisitionTypeID'];
+
+	}
+
 
 }
 
-?>
+?>

resources/admin/classes/domain/Resource.php

@@ -1845,7 +1845,7 @@ public function removeResourceSteps() {
 
 		$query = "DELETE
 			FROM ResourceStep
-			WHERE resourceID = '" . $this->resourceID . "'";
+			WHERE resourceID = '" . $this->resourceID . "' AND archivingDate IS NOT NULL";
 
 		$result = $this->db->processQuery($query);
 	}
@@ -1949,7 +1949,7 @@ public function getResourceSteps() {
 
 		$query = "SELECT * FROM ResourceStep
 					WHERE resourceID = '" . $this->resourceID . "'
-					ORDER BY displayOrderSequence, stepID";
+					ORDER BY (archivingDate IS NOT NULL), archivingDate DESC, displayOrderSequence, stepID";
 
 		$result = $this->db->processQuery($query, 'assoc');
 
@@ -1966,6 +1966,65 @@ public function getResourceSteps() {
 
 	}
 
+    public function getCurrentWorkflowID() {
+        $query = "SELECT Step.workflowID FROM Step, ResourceStep 
+                    WHERE ResourceStep.resourceID = '" . $this->resourceID . "'
+                    AND ResourceStep.archivingDate IS NULL 
+                    AND ResourceStep.stepID = Step.stepID LIMIT 1";
+
+		$result = $this->db->processQuery($query, 'assoc');
+        return $result['workflowID'];
+    }
+
+    public function getCurrentWorkflowResourceSteps(){
+		$query = "SELECT * FROM ResourceStep
+					WHERE resourceID = '" . $this->resourceID . "'
+                    AND archivingDate IS NULL ORDER BY displayOrderSequence, stepID";
+
+		$result = $this->db->processQuery($query, 'assoc');
+
+		$objects = array();
+
+		//need to do this since it could be that there's only one request and this is how the dbservice returns result
+		if (isset($result['resourceStepID'])){
+			$object = new ResourceStep(new NamedArguments(array('primaryKey' => $result['resourceStepID'])));
+			array_push($objects, $object);
+		}else{
+			foreach ($result as $row) {
+				$object = new ResourceStep(new NamedArguments(array('primaryKey' => $row['resourceStepID'])));
+				array_push($objects, $object);
+			}
+		}
+
+		return $objects;
+
+	}
+
+    public function isCurrentWorkflowComplete() {
+        $steps = $this->getCurrentWorkflowResourceSteps(); 
+        foreach ($steps as $step) {
+            if (!$step->isComplete()) return false;
+        }
+        return true;
+    }
+
+
+    public function getDistinctWorkflows() {
+        $query = "SELECT DISTINCT archivingDate FROM ResourceStep
+					WHERE resourceID = '" . $this->resourceID . "'
+                    AND archivingDate IS NOT NULL
+					ORDER BY archivingDate ASC";
+
+		$result = $this->db->processQuery($query, 'assoc');
+
+		return $result;
+
+    }
+
+
+    public function getArchivedResourceSteps() {
+        return $this->getResourceSteps(true);
+    }
 
 
 	//returns first steps (object) in the workflow for this resource
@@ -1974,6 +2033,7 @@ public function getFirstSteps() {
 		$query = "SELECT * FROM ResourceStep
 					WHERE resourceID = '" . $this->resourceID . "'
 					AND (priorStepID is null OR priorStepID = '0')
+                    AND archivingDate IS NULL
 					ORDER BY stepID";
 
 		$result = $this->db->processQuery($query, 'assoc');
@@ -1990,15 +2050,22 @@ public function getFirstSteps() {
 		return $objects;
 	}
 
+    public function archiveWorkflow() {
 
+        // And archive the workflow
+        $query = "UPDATE ResourceStep SET archivingDate=NOW() WHERE archivingDate IS NULL AND resourceID = '" . $this->resourceID . "'";
+		$result = $this->db->processQuery($query);
+    }
+
+    public function deleteWorkflow() {
+        $query = "DELETE FROM ResourceStep WHERE archivingDate IS NULL AND resourceID = '" . $this->resourceID . "'";
+		$result = $this->db->processQuery($query);
+    }
 
 	//enters resource into new workflow
-	public function enterNewWorkflow() {
+	public function enterNewWorkflow($workflowID = null){
 		$config = new Configuration();
 
-		//remove any current workflow steps
-		$this->removeResourceSteps();
-
 		//make sure this resource is marked in progress in case it was archived
 		$status = new Status();
 		$this->statusID = $status->getIDFromName('progress');
@@ -2007,11 +2074,23 @@ public function enterNewWorkflow() {
 
 		//Determine the workflow this resource belongs to
 		$workflowObj = new Workflow();
-		$workflowID = $workflowObj->getWorkflowID($this->resourceTypeID, $this->resourceFormatID, $this->acquisitionTypeID);
 
-		if ($workflowID) {
+        if ($workflowID == null) {
+            $workflowID = $workflowObj->getWorkflowID($this->resourceTypeID, $this->resourceFormatID, $this->acquisitionTypeID);
+        }
+		if ($workflowID){
+
 			$workflow = new Workflow(new NamedArguments(array('primaryKey' => $workflowID)));
+			$resourceTypeObj = new ResourceType();
+            $resourceFormatObj = new ResourceFormat();
+            $acquisitionTypeObj = new AcquisitionType();
+
+            //set new resourceType, resourceFormat and acquisitionType for the resource, according to the selected workflow
+            $this->resourceTypeID = ($workflow->resourceTypeIDValue != null) ? $workflow->resourceTypeIDValue : $resourceTypeObj->getResourceTypeIDByName('any');
+            $this->resourceFormatID =  ($workflow->resourceFormatIDValue != null) ? $workflow->resourceFormatIDValue : $resourceFormatObj->getResourceFormatIDByName('any');
+            $this->acquisitionTypeID = ($workflow->acquisitionTypeIDValue != null) ? $workflow->acquisitionTypeIDValue : $acquisitionTypeObj->getAcquisitionTypeIDByName('any');
 
+            $this->save();
 
 			//Copy all of the step attributes for this workflow to a new resource step
 			foreach ($workflow->getSteps() as $step) {

resources/admin/classes/domain/ResourceFormat.php

@@ -61,8 +61,18 @@ public function getNumberOfChildren(){
 
 	}
 
+    public function getResourceFormatIDByName($name) {
+        $query = "SELECT resourceFormatID from ResourceFormat WHERE UPPER(shortName) = '" . strtoupper($name) . "';";
+
+		$result = $this->db->processQuery($query, 'assoc');
+
+		return $result['resourceFormatID'];
+
+	}
+
+
 
 
 }
 
-?>
+?>

resources/admin/classes/domain/ResourceStep.php

@@ -128,7 +128,9 @@ public function getPriorStep(){
 	}
 
 
-
+    public function isComplete() {
+        return $this->stepEndDate ? true : false;
+    }
 
 
 	//returns array of resource step objects
@@ -241,4 +243,4 @@ public function sendReassignedStepNotification(){
 
 }
 
-?>
+?>

resources/admin/classes/domain/ResourceType.php

@@ -35,7 +35,15 @@ public function getNumberOfChildren(){
 
 	}
 
+    public function getResourceTypeIDByName($name) {
+        $query = "SELECT resourceTypeID from ResourceType WHERE UPPER(shortName) = '" . strtoupper($name) . "';";
+
+		$result = $this->db->processQuery($query, 'assoc');
+
+		return $result['resourceTypeID'];
+
+	}
 
 }
 
-?>
+?>

resources/ajax_forms/getAdminWorkflowForm.php

@@ -58,6 +58,7 @@
 				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='acquisitionTypeID'><?php echo _("Acquisition Type:");?></label></td>
 				<td>
 				<select name='acquisitionTypeID' id='acquisitionTypeID' style='width:100px;' class='changeSelect' >
+				<option value=''></option>
 				<?php
 				foreach ($acquisitionTypeArray as $acquisitionType){
 					if (!(trim(strval($acquisitionType['acquisitionTypeID'])) != trim(strval($workflow->acquisitionTypeIDValue)))){
@@ -74,6 +75,7 @@
 				<td style='vertical-align:top;text-align:left;font-weight:bold;'><label for='resourceFormatID'><?php echo _("Format:");?></label></td>
 				<td>
 				<select name='resourceFormatID' id='resourceFormatID' style='width:100px;' class='changeSelect'>
+				<option value=''></option>
 				<?php
 				foreach ($resourceFormatArray as $resourceFormat){
 					if (!(trim(strval($resourceFormat['resourceFormatID'])) != trim(strval($workflow->resourceFormatIDValue)))){