License Change, biostar_setting.js script and readme update

navariltd · May 7, 2024 · bc65887 · bc65887
1 parent f2b2bba
commit bc65887
Show file tree

Hide file tree

Showing 6 changed files with 672 additions and 28 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
-## Navari Biostar Integration
+## Frappe HR integration with Biostar Biometric
 
-Biometrics Integration Application with FrappeHR
+Frappe HR integration with Biostar Biometric
 
 #### License
 
-mit
+GNU
diff --git a/license.txt b/license.txt
diff --git a/navari_biostar_integration/controllers/biostar_calls.py b/navari_biostar_integration/controllers/biostar_calls.py
@@ -196,12 +196,14 @@ def is_cookie_expired(cookie_string):
     cookie.load(cookie_string)
 
     """extract 'expires' attribute"""
-    expires = cookie.get("bs-ta-session-id").get("expires")
+    bs_ta_session_id_cookie = cookie.get("bs-ta-session-id")
 
-    """'expires' attribute absent, cookie does not expire"""
-    if not expires:
+    """ Check if 'bs-ta-session-id' cookie exists and has 'expires' attribute """
+    if bs_ta_session_id_cookie is None or "expires" not in bs_ta_session_id_cookie:
         return False
 
+    expires = bs_ta_session_id_cookie["expires"]
+
     expires_date = datetime.strptime(expires, "%a, %d %b %Y %H:%M:%S %Z")
 
     return expires_date <= datetime.utcnow()

diff --git a/...ostar_integration/navari_biostar_integration/doctype/biostar_settings/biostar_settings.js b/...ostar_integration/navari_biostar_integration/doctype/biostar_settings/biostar_settings.js
@@ -37,7 +37,7 @@ frappe.ui.form.on("Biostar Settings", {
     loader.style.display = "block";
     frappe.call({
       method:
-        "navari_vf.controllers.biostar_calls.add_checkin_logs_for_specified_dates",
+        "navari_biostar_integration.controllers.biostar_calls.add_checkin_logs_for_specified_dates",
       args: {
         start_date: frm.doc.start_date,
         end_date: frm.doc.end_date,

diff --git a/...tar_integration/navari_biostar_integration/doctype/biostar_settings/biostar_settings.json b/...tar_integration/navari_biostar_integration/doctype/biostar_settings/biostar_settings.json
@@ -2,7 +2,9 @@
  "actions": [],
  "allow_rename": 1,
  "creation": "2024-05-07 09:57:55.164446",
+ "default_view": "List",
  "doctype": "DocType",
+ "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
   "biostar_server_login_section",