Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions projectit/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


@frappe.whitelist()
def get_employee_id(user_id):
def get_employee_id(user_id: str):
employee_id = frappe.get_list(
"Employee", filters={"user_id": user_id}, fields=["name"]
)
Expand All @@ -13,7 +13,7 @@ def get_employee_id(user_id):


@frappe.whitelist()
def get_project_allocation(employee_id):
def get_project_allocation(employee_id: str):
if frappe.has_permission("Project", ptype="read"):
project_list = frappe.db.sql(
"""
Expand All @@ -32,7 +32,13 @@ def get_project_allocation(employee_id):


@frappe.whitelist()
def upload_base64_file(content, filename, dt=None, dn=None, fieldname=None):
def upload_base64_file(
content: str,
filename: str,
dt: str | None = None,
dn: str | None = None,
fieldname: str | None = None,
):
import base64
import io
from mimetypes import guess_type
Expand Down Expand Up @@ -77,15 +83,15 @@ def get_work_time_settings():
return frappe.get_single("Work Time Settings")


@frappe.whitelist(allow_guest=True)
@frappe.whitelist(allow_guest=True) # nosemgrep: frappe-semgrep-rules.rules.security.guest-whitelisted-method # fmt: skip
def get_header_info():
app_logo = frappe.get_single("Navbar Settings").app_logo
company = frappe.get_single("Global Defaults").default_company
return app_logo, company


@frappe.whitelist()
def get_instructions(project_name, employee_id):
def get_instructions(project_name: str, employee_id: str):
if frappe.has_permission("Project", ptype="read"):
data = frappe.db.sql(
"""
Expand All @@ -106,7 +112,7 @@ def get_instructions(project_name, employee_id):


@frappe.whitelist()
def get_team_members(project_name):
def get_team_members(project_name: str):
if frappe.has_permission("Project", ptype="read"):
data = frappe.db.sql(
"""
Expand Down Expand Up @@ -136,7 +142,7 @@ def get_team_members(project_name):


@frappe.whitelist()
def get_employee_schedule(date, employee_id):
def get_employee_schedule(date: str, employee_id: str):
if frappe.has_permission("Project", ptype="read"):
project_list = frappe.db.sql(
"""
Expand All @@ -155,7 +161,7 @@ def get_employee_schedule(date, employee_id):


@frappe.whitelist()
def project_with_members(employee_id):
def project_with_members(employee_id: str):
employee_id = get_employee_id(frappe.session.user)
if employee_id:
modules = frappe.get_list(
Expand Down Expand Up @@ -205,7 +211,7 @@ def get_project_list():


@frappe.whitelist()
def get_modules_for_router(user_id):
def get_modules_for_router(user_id: str):
employee_id = get_employee_id(user_id)
modules = frappe.get_list(
"Mobile Module",
Expand All @@ -220,7 +226,7 @@ def get_modules_for_router(user_id):


@frappe.whitelist()
def get_employee_with_workit(project_name):
def get_employee_with_workit(project_name: str):
if frappe.has_permission("Employee", ptype="read"):
employee = frappe.db.sql(
"""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

frappe.ui.form.on("Project Allocation and Instrucions", {
refresh(frm) {
frm.add_custom_button("Back", () => {
frm.add_custom_button(__("Back"), () => {
frappe.set_route("Form", "Project", frm.doc.project);
});
},
Expand Down
2 changes: 1 addition & 1 deletion projectit/public/js/project.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
frappe.ui.form.on("Project", {
refresh(frm) {
frm.add_custom_button(
"Allocation and Instructions",
__("Allocation and Instructions"),
() => {
frappe.db
.get_list("Project Allocation and Instrucions", {
Expand Down
Loading