Change queries that fetch moments for a given experience

special2.php

@@ -98,7 +98,8 @@
 		
 		
 		// Create a new event for each moment
-		$queryMoments = "SELECT * FROM `subquestionnair` WHERE id_questionnair IN (SELECT id_questionnair FROM `experience_questionnair` WHERE id_experience = '$experienceID');";
+		$queryMoments = "SELECT SQ.* FROM subquestionnair AS SQ JOIN experience_subquestionnair AS ES WHERE SQ.id = ES.id_subquestionnair AND ES.id_experience = '$experienceID';";
+// 		$queryMoments = "SELECT * FROM `subquestionnair` WHERE id_questionnair IN (SELECT id_questionnair FROM `experience_questionnair` WHERE id_experience = '$experienceID');";
 		$resultMoments = mysqli_query($connection, $queryMoments);
 		while($rowMoments = mysqli_fetch_assoc($resultMoments)) {
 		

viewExperience.php

@@ -33,6 +33,12 @@
 		}
 		
 	}
+	
+	// FETCH EXPERIENCE'S PROJECT ID
+	$queryProject = "SELECT id_project FROM project_experience WHERE id_experience = '$experienceID';";
+	$resultProject = mysqli_query($connection, $queryProject);
+	$rowProject = mysqli_fetch_assoc($resultProject);
+
 
 	include_once 'header.php';
 	
@@ -263,7 +269,8 @@
 					<div class="col-sm-12">
 						<?php
 						
-  							$query4 = "SELECT * FROM subquestionnair WHERE `id_questionnair` IN (SELECT `id_questionnair` FROM experience_questionnair WHERE `id_experience` = '$experienceID') ORDER BY date_to_administer ASC;";
+//   							$query4 = "SELECT * FROM subquestionnair WHERE `id_questionnair` IN (SELECT `id_questionnair` FROM experience_questionnair WHERE `id_experience` = '$experienceID') ORDER BY date_to_administer ASC;";
+  							$query4 = "SELECT SQ.* FROM subquestionnair AS SQ JOIN experience_subquestionnair AS ES WHERE SQ.id = ES.id_subquestionnair AND ES.id_experience = '$experienceID' ORDER BY SQ.date_to_administer ASC;";
 							$result4 = mysqli_query($connection, $query4);
 							
 							// IF THE EXPERIENCE HAS AT LEAST ONE MOMENT ASSOCIATED TO IT, SHOW IT
@@ -975,8 +982,14 @@
  						<div class='modal-body'>
 
 							<div class="form-horizontal">
-							
+		
+								<!-- EXPERIENCE ID -->					
 								<input type="hidden" name="id_experience" value="<?php echo $experienceID; ?>" required>
+								
+
+								<!-- PROJECT ID (0 IF THERE'S NONE) -->
+								<input type="hidden" name="projectID" value="<?php echo ($rowProject['id_project'] ? $rowProject['id_project'] : 0); ?>" required>
+							
 							
 								<div class="row">
 									<div class="col-sm-12">
@@ -1045,15 +1058,8 @@
 							<br>
 							
 
-							<?php
-								$queryProject = "SELECT id_project FROM project_experience WHERE id_experience = '$experienceID';";
-								$resultProject = mysqli_query($connection, $queryProject);
-								$rowProject = mysqli_fetch_assoc($resultProject);
-							?>
-							<!-- PROJECT ID (EMPTY STRING IF THERE'S NONE) -->
-							<input type="hidden" name="projectID" value="<?php echo $rowProject['id_project']; ?>">
-							
-							
+							<!-- PROJECT ID (0 IF THERE'S NONE) -->
+							<input type="hidden" name="projectID" value="<?php echo ($rowProject['id_project'] ? $rowProject['id_project'] : 0); ?>">
 							
 							
 							<!-- FROM QUESTIONNAIRE -->