Merge branch 'dev-hiresuit' into staging

awsmin · Dec 17, 2024 · 8b332b4 · 8b332b4
2 parents a9b2e9f + e346770
commit 8b332b4
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 29 deletions.
diff --git a/admin/templates/overview/main.php b/admin/templates/overview/main.php
@@ -208,7 +208,7 @@
 						</a>
 					</div><!-- .awsm-jobs-overview-col-head -->
 				<?php
-					$applications = AWSM_Job_Openings::get_recent_applications( 10, false );
+					$applications = AWSM_Job_Openings::get_recent_applications( 7, false );
 				if ( ! empty( $applications ) ) :
 					foreach ( $applications as $application ) :
 						$applicant_email = get_post_meta( $application->ID, 'awsm_applicant_email', true );

diff --git a/assets/css/admin-global.min.css b/assets/css/admin-global.min.css
diff --git a/assets/css/admin-overview.min.css b/assets/css/admin-overview.min.css
diff --git a/assets/css/admin.min.css b/assets/css/admin.min.css
diff --git a/assets/css/general.min.css b/assets/css/general.min.css
diff --git a/assets/css/public/style.css b/assets/css/public/style.css
@@ -534,7 +534,7 @@ ul.awsm-error-message li {
 	padding: 50px 0;
 }
 
-.awsm-jobs-loading {
+.awsm-job-listings {
 	position: relative;
 }
 

diff --git a/assets/css/style.min.css b/assets/css/style.min.css
diff --git a/assets/css/style.min.css.map b/assets/css/style.min.css.map
diff --git a/assets/js/admin-overview.min.js b/assets/js/admin-overview.min.js
diff --git a/assets/js/admin.min.js b/assets/js/admin.min.js
diff --git a/assets/js/public/job-listings.js b/assets/js/public/job-listings.js
@@ -33,7 +33,22 @@ jQuery(function($) {
 		var formData = $filterForm.serializeArray();
 		var listings = $wrapper.data('listings');
 		var specs = $wrapper.data('specs');
-
+
+		$rootWrapper.find('.awsm-filter-item').each(function() {
+			var currentLoopSpec = $(this).data('filter');
+			var searchParams = new URLSearchParams(document.location.search);
+			var currentSpecQueryVal = searchParams.get(currentLoopSpec); 
+			var $currentOption = $(this).find('.awsm-filter-option');
+
+			if ($currentOption.val().length === 0 && currentSpecQueryVal && currentSpecQueryVal.length > 0) {
+				formData.forEach(function(item) {
+					if (item.name === $currentOption.attr('name')) {
+						item.value = '-1';
+					}
+				});
+			}
+		});
+
 		formData.push({
 			name: 'listings_per_page',
 			value: listings
@@ -112,16 +127,16 @@ jQuery(function($) {
 		awsmJobFilters($rootWrapper);
 	}
 
-	if ($(rootWrapperSelector).length > 0) {
-		$(rootWrapperSelector).each(function() {
-			var $currentWrapper = $(this);
-			var $filterForm = $currentWrapper.find(filterSelector + ' form');
-			if (awsmJobsPublic.is_search.length > 0 || filterCheck($filterForm)) {
-				triggerFilter = true;
-				awsmJobFilters($currentWrapper);
-			}
-		});
-	}
+	// if ($(rootWrapperSelector).length > 0) {
+	// 	$(rootWrapperSelector).each(function() {
+	// 		var $currentWrapper = $(this);
+	// 		var $filterForm = $currentWrapper.find(filterSelector + ' form');
+	// 		if (awsmJobsPublic.is_search.length > 0 || filterCheck($filterForm)) {
+				// triggerFilter = true;
+				// awsmJobFilters($currentWrapper);
+	// 		}
+	// 	});
+	// }
 
 	var updateQuery = function(key, value, url) {
 		url = typeof url !== 'undefined' ? url : currentUrl;

diff --git a/assets/js/script.min.js b/assets/js/script.min.js
diff --git a/assets/js/script.min.js.map b/assets/js/script.min.js.map