Jelajahi Sumber

Replace collapse animations with jQuery animations

Alan Lam 6 tahun lalu
induk
melakukan
496baba3d6
2 mengubah file dengan 19 tambahan dan 19 penghapusan
  1. 13 13
      public/js/app-completed-tests.js
  2. 6 6
      views/modal_test_invoice.php

+ 13 - 13
public/js/app-completed-tests.js

@@ -1,6 +1,6 @@
 $(function() {
 
-	const $pleaseWaitContainer = $("#please-wait-container");
+	const $statusContainer = $("#status-container");
 	const $travelCostsQuestionContainer = $("#travel-costs-question-container");
 	const $travelCostsApprovedContainer = $("#travel-costs-approved-container");
 	const $downloadInvoiceContainer = $("#download-invoice-container");
@@ -11,17 +11,17 @@ $(function() {
 
 	const $approvedButton = $(".btn-costs-approved");
 	$approvedButton.on("click", () => {
-		$travelCostsQuestionContainer.collapse("hide");
-		$travelCostsApprovedContainer.collapse("show");
-		$downloadInvoiceContainer.collapse("show");
+		$travelCostsQuestionContainer.slideUp("fast");
+		$travelCostsApprovedContainer.slideDown("fast");
+		$downloadInvoiceContainer.slideDown("fast");
 		$descriptionField.prop("required", true);
 		$photoField.prop("required", true);
 	});
 
 	const $notApprovedButton = $(".btn-costs-not-approved");
 	$notApprovedButton.on("click", () => {
-		$travelCostsQuestionContainer.collapse("hide");
-		$downloadInvoiceContainer.collapse("show");
+		$travelCostsQuestionContainer.slideUp("fast");
+		$downloadInvoiceContainer.slideDown("fast");
 		$descriptionField.prop("required", false);
 		$photoField.prop("required", false);
 	});
@@ -38,13 +38,14 @@ $(function() {
 		$.get(`/account/tests/completed/${id}`).then(
 			response => {
 
-				$pleaseWaitContainer.collapse("hide");
+				$statusContainer.slideUp("fast");
 
 				$travelCostsField.prop("disabled", response.invoiceGenerated);
 				$descriptionField.prop("disabled", response.invoiceGenerated);
 				$photoField.prop("disabled", response.invoiceGenerated);
 
 				if(response.invoiceGenerated) {
+
 					if(response.travelCosts > 0) {
 						$approvedButton.trigger("click");
 						$travelCostsField.val(response.travelCosts);
@@ -52,11 +53,10 @@ $(function() {
 					}
 					else {
 						$notApprovedButton.trigger("click");
-						console.log("nope");
 					}
 				}
 				else {
-					$travelCostsQuestionContainer.collapse("show");
+					$travelCostsQuestionContainer.slideDown("fast");
 				}
 
 
@@ -65,10 +65,10 @@ $(function() {
 
 	});
 	$invoiceModal.on("hidden.bs.modal", () => {
-		$pleaseWaitContainer.collapse("show");
-		$travelCostsQuestionContainer.collapse("hide");
-		$travelCostsApprovedContainer.collapse("hide");
-		$downloadInvoiceContainer.collapse("hide");
+		$statusContainer.slideDown("fast");
+		$travelCostsQuestionContainer.slideUp("fast");
+		$travelCostsApprovedContainer.slideUp("fast");
+		$downloadInvoiceContainer.slideUp("fast");
 		$invoiceModal.find("form").get(0).reset();
 
 		$travelCostsField.prop("disabled", false);

+ 6 - 6
views/modal_test_invoice.php

@@ -4,25 +4,25 @@
 			<form method="post" target="_blank" enctype="multipart/form-data">
 
 				<div class="modal-header">
-					<h5 class="modal-title"><strong><?=htmlspecialchars(__("Download Invoice"))?></strong></h5>
+					<h5 class="modal-title"><strong><?=htmlspecialchars(__("Invoice"))?></strong></h5>
 					<button type="button" class="close" data-dismiss="modal" aria-label="Close">
 						<span aria-hidden="true">&times;</span>
 					</button>
 				</div>
 				<div class="modal-body">
 
-					<div id="please-wait-container" class="alert alert-info text-center collapse show">
+					<div id="status-container" class="alert alert-info">
 						<i class="fa fa-fw fa-sync fa-pulse"></i>
-						<?=htmlspecialchars(__("Fetching invoice data..."))?>
+						<span><?=htmlspecialchars(__("Fetching invoice data..."))?></span>
 					</div>
 
-					<div id="travel-costs-question-container" class="collapse text-center">
+					<div id="travel-costs-question-container" class="text-center" style="display: none;">
 						<label><?=htmlspecialchars(__("Were travel costs pre-approved?"))?></label><br />
 						<button type="button" class="btn btn-lg btn-success btn-costs-approved"><?=htmlspecialchars(__("Yes"))?></button>
 						<button type="button" class="btn btn-lg btn-danger btn-costs-not-approved"><?=htmlspecialchars(__("No"))?></button>
 					</div>
 
-					<div id="travel-costs-approved-container" class="collapse">
+					<div id="travel-costs-approved-container" style="display: none;">
 						<div class="form-group">
 							<label for="travel-costs"><?=htmlspecialchars(__("Travel Costs"))?></label>
 							<div class="input-group">
@@ -51,7 +51,7 @@
 
 					</div>
 
-					<div id="download-invoice-container" class="collapse">
+					<div id="download-invoice-container" style="display: none;">
 						<div class="form-group">
 							<button class="btn btn-primary" type="submit"><?=htmlspecialchars(__("Download Invoice"))?></button>
 						</div>