Merge pull request #2395 from frappe/roster-default-company

frappe · Nov 7, 2024 · 11f9482 · 11f9482
2 parents d043e05 + 56973da
commit 11f9482
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 8 deletions.
diff --git a/hrms/api/roster.py b/hrms/api/roster.py
@@ -8,6 +8,11 @@
 from hrms.hr.doctype.shift_assignment_tool.shift_assignment_tool import create_shift_assignment
 
 
+@frappe.whitelist()
+def get_default_company() -> str:
+	return frappe.defaults.get_user_default("Company")
+
+
 @frappe.whitelist()
 def get_values(doctype: str, name: str, fields: list) -> dict[str, str]:
 	return frappe.db.get_value(doctype, name, fields, as_dict=True)

diff --git a/roster/src/components/MonthViewHeader.vue b/roster/src/components/MonthViewHeader.vue
@@ -38,7 +38,7 @@
 
 <script setup lang="ts">
 import { ref, reactive, watch } from "vue";
-import { FormControl, createListResource } from "frappe-ui";
+import { FormControl, createResource, createListResource } from "frappe-ui";
 import { Dayjs } from "dayjs";
 
 import { raiseToast } from "../utils";
@@ -72,7 +72,7 @@ const filters: {
 watch(
 	() => filters.company.model,
 	(val) => {
-		if (val?.value) return getFilterOptions("department", { company: val.value });
+		if (val?.value) getFilterOptions("department", { company: val.value });
 		else {
 			filters.department.model = null;
 			filters.department.options = [];
@@ -99,23 +99,31 @@ const toTitleCase = (str: string) =>
 
 // RESOURCES
 
+const defaultCompany = createResource({
+	url: "hrms.api.roster.get_default_company",
+	auto: true,
+	onSuccess: () => {
+		["company", "branch", "designation", "shift_type"].forEach((field) =>
+			getFilterOptions(field as FilterField),
+		);
+	},
+});
+
 const getFilterOptions = (field: FilterField, listFilters: { company?: string } = {}) => {
 	createListResource({
 		doctype: toTitleCase(field),
 		fields: ["name"],
 		filters: listFilters,
+		pageLength: 100,
 		auto: true,
 		onSuccess: (data: { name: string }[]) => {
-			filters[field].model = { value: "" };
+			const value = field === "company" ? defaultCompany.data : "";
+			filters[field].model = { value };
 			filters[field].options = data.map((item) => item.name);
 		},
 		onError(error: { messages: string[] }) {
 			raiseToast("error", error.messages[0]);
 		},
 	});
 };
-
-["company", "branch", "designation", "shift_type"].forEach((field) =>
-	getFilterOptions(field as FilterField),
-);
 </script>
diff --git a/roster/src/views/MonthView.vue b/roster/src/views/MonthView.vue
@@ -28,12 +28,14 @@
 				@addToMonth="addToMonth"
 			/>
 			<MonthViewTable
+				v-if="isCompanySelected"
 				ref="monthViewTable"
 				:firstOfMonth="firstOfMonth"
 				:employees="employees.data || []"
 				:employeeFilters="employeeFilters"
 				:shiftTypeFilter="shiftTypeFilter"
 			/>
+			<div v-else class="my-40 text-center">Please select a company.</div>
 		</div>
 	</div>
 	<ShiftAssignmentDialog
@@ -61,6 +63,7 @@ export type EmployeeFilters = {
 };
 
 const monthViewTable = ref<InstanceType<typeof MonthViewTable>>();
+const isCompanySelected = ref(false);
 const showShiftAssignmentDialog = ref(false);
 const firstOfMonth = ref(dayjs().date(1).startOf("D"));
 const shiftTypeFilter = ref("");
@@ -73,6 +76,8 @@ const addToMonth = (change: number) => {
 };
 
 const updateFilters = (newFilters: EmployeeFilters & { shift_type: string }) => {
+	isCompanySelected.value = !!newFilters.company;
+	if (!isCompanySelected.value) return;
 	let employeeUpdated = false;
 	(Object.entries(newFilters) as [keyof EmployeeFilters | "shift_type", string][]).forEach(
 		([key, value]) => {
@@ -95,7 +100,7 @@ const employees = createListResource({
 	doctype: "Employee",
 	fields: ["name", "employee_name", "designation", "image"],
 	filters: employeeFilters,
-	auto: true,
+	pageLength: 99999,
 	onError(error: { messages: string[] }) {
 		raiseToast("error", error.messages[0]);
 	},