SAK-50218 Assignments filter assignments by group (sakaiproject#12669)

susowrc · Jun 19, 2024 · 27e652d · 27e652d
1 parent 5b0518d
commit 27e652d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm
@@ -27,7 +27,19 @@
         $('#filterByGroup').multiselect({
             enableFiltering: true,
             filterPlaceholder: '$tlang.getString("listassig.searchgroup")',
-            enableCaseInsensitiveFiltering: true
+            enableCaseInsensitiveFiltering: true,
+            templates: {
+                button: `
+                    <button type="button"
+                            class="select multiselect"
+                            data-bs-toggle="dropdown">
+                        <span class="multiselect-selected-text"></span>
+                    </button>
+                `,
+                filter: `
+                    <div class="multiselect-filter d-flex align-items-center"><i class="fa fa-sm fa-search text-muted"></i><input type="search" class="multiselect-search form-control" /></div>
+                `,
+            },
         });
         ASN.checkIframeTags();
 
@@ -84,10 +96,9 @@
 
 	<div class="sakai-table-toolBar">
 		#if($!groupFilterEnabled && $!filterGroupIterator.hasNext())
-		<div class="sakai-table-filterContainer">
+		<div class="sakai-table-filterGroupContainer">
 			<div class="row" id="filterByGroupDiv">
-				<div class="col-md-12">
-				<form id="groupFilterForm" name="groupFilterForm" class="inlineForm" method="post" action="#toolForm("AssignmentAction")">
+				<form id="groupFilterForm" name="groupFilterForm" class="inlineForm col-md-12" method="post" action="#toolForm("AssignmentAction")">
 					<input type="hidden" name="eventSubmit_doFilterByGroup" value="filterByGroup" />
 					<label for="groupFilter">
 						$!tlang.getString("listassig.filterbygroup")
@@ -101,7 +112,6 @@
 					</select>
 					<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
 				</form>
-				</div>
 			</div>
 		</div>
 		#end

diff --git a/library/src/skins/default/src/sass/modules/tool/_table.scss b/library/src/skins/default/src/sass/modules/tool/_table.scss
@@ -78,6 +78,18 @@ table{
 			margin: 0 4px 0 0;
 		}
 	}
+	.sakai-table-filterGroupContainer
+	{
+		@include display-flex();
+		@include flex-direction(column);
+		margin: 0 10px 10px 0;
+		padding-right: 10px;
+
+		label
+		{
+			margin: 0 4px 0 0;
+		}
+	}
 	.sakai-table-viewFilter, .sakai-table-searchFilter
 	{
 		@include display-flex();
@@ -223,7 +235,7 @@ table{
 		@include justify-content(flex-start);
 		@include align-items(center);
 
-		.sakai-table-filterContainer, .sakai-table-viewFilter
+		.sakai-table-filterContainer, .sakai-table-filterGroupContainer, .sakai-table-viewFilter
 		{
 			margin-right: 0;
 			padding-right: 0;
@@ -285,7 +297,7 @@ table{
 	@include align-items(flex-start);
 	margin-bottom: $standard-spacing;
 
-	.sakai-table-filterContainer
+	.sakai-table-filterContainer, .sakai-table-filterGroupContainer
 	{
 		margin: $standard-spacing auto 0 0;
 	}
@@ -311,7 +323,7 @@ table{
 	{
 		@include align-items(center);
 
-		.sakai-table-filterContainer
+		.sakai-table-filterContainer, .sakai-table-filterGroupContainer
 		{
 			margin-right: 0;
 		}