checkpoint 1
This commit is contained in:
parent
7dcb29de25
commit
9a120ef6f7
@ -114,6 +114,7 @@
|
|||||||
?>
|
?>
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<h1>Candidate: <?php echo htmlspecialchars($candidate['candidate_id']); ?></h1>
|
<h1>Candidate: <?php echo htmlspecialchars($candidate['candidate_id']); ?></h1>
|
||||||
|
<a href="project.php?id=<?php echo htmlspecialchars($candidate['project_id']); ?>" class="btn btn-secondary">Back to Project</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card">
|
<div class="card">
|
||||||
@ -211,6 +212,7 @@
|
|||||||
$stmt_sample_wells = $pdo->prepare("
|
$stmt_sample_wells = $pdo->prepare("
|
||||||
SELECT
|
SELECT
|
||||||
sw.sample_id,
|
sw.sample_id,
|
||||||
|
sw.name,
|
||||||
wp.Temperature,
|
wp.Temperature,
|
||||||
wp.incubation_start,
|
wp.incubation_start,
|
||||||
wp.incubation_end,
|
wp.incubation_end,
|
||||||
@ -257,7 +259,12 @@
|
|||||||
c.candidate_id = ?
|
c.candidate_id = ?
|
||||||
");
|
");
|
||||||
$stmt_sample_wells->execute([$_GET['id']]);
|
$stmt_sample_wells->execute([$_GET['id']]);
|
||||||
$sample_wells = $stmt_sample_wells->fetchAll(PDO::FETCH_GROUP | PDO::FETCH_ASSOC);
|
$sample_wells_result = $stmt_sample_wells->fetchAll(PDO::FETCH_ASSOC);
|
||||||
|
|
||||||
|
$sample_wells = [];
|
||||||
|
foreach ($sample_wells_result as $row) {
|
||||||
|
$sample_wells[$row['sample_id']][] = $row;
|
||||||
|
}
|
||||||
|
|
||||||
if ($sample_wells && count($sample_wells) > 0):
|
if ($sample_wells && count($sample_wells) > 0):
|
||||||
?>
|
?>
|
||||||
@ -266,6 +273,7 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th>Sample ID</th>
|
<th>Sample ID</th>
|
||||||
|
<th>Name</th>
|
||||||
<th>Composition</th>
|
<th>Composition</th>
|
||||||
<th>Incubation</th>
|
<th>Incubation</th>
|
||||||
<th>PXRD Characterization</th>
|
<th>PXRD Characterization</th>
|
||||||
@ -280,6 +288,7 @@
|
|||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
<td><?php echo htmlspecialchars($sample_id); ?></td>
|
<td><?php echo htmlspecialchars($sample_id); ?></td>
|
||||||
|
<td><?php echo htmlspecialchars($first_row['name']); ?></td>
|
||||||
<td>
|
<td>
|
||||||
<ul>
|
<ul>
|
||||||
<?php foreach ($rows as $row): ?>
|
<?php foreach ($rows as $row): ?>
|
||||||
|
|||||||
@ -123,6 +123,7 @@ CREATE TABLE IF NOT EXISTS `Sample_Well` (
|
|||||||
`well_plate_id` Int,
|
`well_plate_id` Int,
|
||||||
`sample_id` Int NOT NULL AUTO_INCREMENT,
|
`sample_id` Int NOT NULL AUTO_INCREMENT,
|
||||||
`picture_url` text,
|
`picture_url` text,
|
||||||
|
`name` text,
|
||||||
PRIMARY KEY (`sample_id`),
|
PRIMARY KEY (`sample_id`),
|
||||||
FOREIGN KEY (`well_plate_id`)
|
FOREIGN KEY (`well_plate_id`)
|
||||||
REFERENCES `Well_Plate`(`well_plate_id`)
|
REFERENCES `Well_Plate`(`well_plate_id`)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user