Bug fixes to activation screen and change equipment category

ivebeenlinuxed · Jul 22, 2015 · bb27ca2 · bb27ca2
1 parent 53f385a
commit bb27ca2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/framework/application/view/api/html/_template/full/bottom.php b/framework/application/view/api/html/_template/full/bottom.php
@@ -39,7 +39,7 @@
 <link rel="import" href="/widget/text/loader" />
 
 
-<link rel="import" href="/js/widget/home_activations.js" />
+<script type="text/javascript" src="/js/widget/home_activations.js"></script>
 <template id="home-activations-template">
 <tr>
 	<td></td>

diff --git a/framework/application/view/api/html/equipment/singular/view/full.php b/framework/application/view/api/html/equipment/singular/view/full.php
@@ -16,6 +16,20 @@ class="form-control" type="text" data-table="equipment"
 					<label class="control-label">In Service</label>
 					NYI
 				</div>
+				<div class="form-group">
+					<label class="control-label">Category</label> <select
+						class="form-control" data-table="equipment" data-field="category"
+						data-id="<?php echo $equipment->id ?>">
+		<?php
+		foreach ( \Model\EquipmentCategory::getAll() as $equipment_category ) {
+			?>
+		<option value="<?php echo $equipment_category->id ?>"
+							<?php echo $equipment_category->id==$equipment->category? "selected" : "" ?>><?php echo $equipment_category->name ?></option>
+		<?php
+		}
+		?>
+	</select>
+				</div>
 			</div>
 		</div>
 	</div>