From 136f16c9cc806e616486e0f6da78feb325a71e85 Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Thu, 1 Dec 2022 12:48:33 +0530 Subject: [PATCH 1/2] fix: renamed skill doctype to user skill --- lms/lms/doctype/skills/skills.json | 9 +++++---- lms/lms/doctype/{skill => user_skill}/__init__.py | 0 .../test_skill.py => user_skill/test_user_skill.py} | 2 +- .../{skill/skill.js => user_skill/user_skill.js} | 2 +- .../{skill/skill.json => user_skill/user_skill.json} | 2 +- .../{skill/skill.py => user_skill/user_skill.py} | 2 +- lms/patches.txt | 1 + lms/patches/v0_0/skill_to_user_skill.py | 10 ++++++++++ 8 files changed, 20 insertions(+), 8 deletions(-) rename lms/lms/doctype/{skill => user_skill}/__init__.py (100%) rename lms/lms/doctype/{skill/test_skill.py => user_skill/test_user_skill.py} (72%) rename lms/lms/doctype/{skill/skill.js => user_skill/user_skill.js} (80%) rename lms/lms/doctype/{skill/skill.json => user_skill/user_skill.json} (97%) rename lms/lms/doctype/{skill/skill.py => user_skill/user_skill.py} (85%) create mode 100644 lms/patches/v0_0/skill_to_user_skill.py diff --git a/lms/lms/doctype/skills/skills.json b/lms/lms/doctype/skills/skills.json index 856b0053..9128d3b4 100644 --- a/lms/lms/doctype/skills/skills.json +++ b/lms/lms/doctype/skills/skills.json @@ -15,14 +15,14 @@ "fieldtype": "Link", "in_list_view": 1, "label": "Skill Name", - "options": "Skill", + "options": "User Skill", "reqd": 1 } ], "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2021-12-21 09:59:31.631132", + "modified": "2022-12-01 11:28:53.518929", "modified_by": "Administrator", "module": "LMS", "name": "Skills", @@ -30,5 +30,6 @@ "owner": "Administrator", "permissions": [], "sort_field": "modified", - "sort_order": "DESC" -} \ No newline at end of file + "sort_order": "DESC", + "states": [] +} diff --git a/lms/lms/doctype/skill/__init__.py b/lms/lms/doctype/user_skill/__init__.py similarity index 100% rename from lms/lms/doctype/skill/__init__.py rename to lms/lms/doctype/user_skill/__init__.py diff --git a/lms/lms/doctype/skill/test_skill.py b/lms/lms/doctype/user_skill/test_user_skill.py similarity index 72% rename from lms/lms/doctype/skill/test_skill.py rename to lms/lms/doctype/user_skill/test_user_skill.py index 0e49e142..b2020760 100644 --- a/lms/lms/doctype/skill/test_skill.py +++ b/lms/lms/doctype/user_skill/test_user_skill.py @@ -5,5 +5,5 @@ import unittest -class TestSkill(unittest.TestCase): +class TestUserSkill(unittest.TestCase): pass diff --git a/lms/lms/doctype/skill/skill.js b/lms/lms/doctype/user_skill/user_skill.js similarity index 80% rename from lms/lms/doctype/skill/skill.js rename to lms/lms/doctype/user_skill/user_skill.js index 67424793..77941010 100644 --- a/lms/lms/doctype/skill/skill.js +++ b/lms/lms/doctype/user_skill/user_skill.js @@ -1,7 +1,7 @@ // Copyright (c) 2021, Frappe and contributors // For license information, please see license.txt -frappe.ui.form.on("Skill", { +frappe.ui.form.on("User Skill", { // refresh: function(frm) { // } }); diff --git a/lms/lms/doctype/skill/skill.json b/lms/lms/doctype/user_skill/user_skill.json similarity index 97% rename from lms/lms/doctype/skill/skill.json rename to lms/lms/doctype/user_skill/user_skill.json index c9d1820e..ecc08a98 100644 --- a/lms/lms/doctype/skill/skill.json +++ b/lms/lms/doctype/user_skill/user_skill.json @@ -22,7 +22,7 @@ "modified": "2021-12-21 09:35:44.265910", "modified_by": "Administrator", "module": "LMS", - "name": "Skill", + "name": "User Skill", "naming_rule": "By fieldname", "owner": "Administrator", "permissions": [ diff --git a/lms/lms/doctype/skill/skill.py b/lms/lms/doctype/user_skill/user_skill.py similarity index 85% rename from lms/lms/doctype/skill/skill.py rename to lms/lms/doctype/user_skill/user_skill.py index cad82055..2a8d0ae5 100644 --- a/lms/lms/doctype/skill/skill.py +++ b/lms/lms/doctype/user_skill/user_skill.py @@ -5,5 +5,5 @@ from frappe.model.document import Document -class Skill(Document): +class UserSkill(Document): pass diff --git a/lms/patches.txt b/lms/patches.txt index a8673351..065b5637 100644 --- a/lms/patches.txt +++ b/lms/patches.txt @@ -39,3 +39,4 @@ lms.patches.v0_0.convert_progress_to_float lms.patches.v0_0.add_pages_to_nav #25-11-2022 lms.patches.v0_0.change_role_names lms.patches.v0_0.quiz_submission_result +lms.patches.v0_0.skill_to_user_skill diff --git a/lms/patches/v0_0/skill_to_user_skill.py b/lms/patches/v0_0/skill_to_user_skill.py new file mode 100644 index 00000000..bd09b9f1 --- /dev/null +++ b/lms/patches/v0_0/skill_to_user_skill.py @@ -0,0 +1,10 @@ +import frappe + +def execute(): + frappe.reload_doc("lms", "doctype", "user_skill") + skills = frappe.get_all("Skill", pluck="name") + for skill in skills: + frappe.get_doc({ + "doctype": "User Skill", + "skill": skill + }).save() From 616a45ebc55e7bbc70cd63e3372f9003fc24950f Mon Sep 17 00:00:00 2001 From: Jannat Patel Date: Thu, 1 Dec 2022 13:13:01 +0530 Subject: [PATCH 2/2] fix: linter --- lms/patches/v0_0/skill_to_user_skill.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lms/patches/v0_0/skill_to_user_skill.py b/lms/patches/v0_0/skill_to_user_skill.py index bd09b9f1..14d1b4be 100644 --- a/lms/patches/v0_0/skill_to_user_skill.py +++ b/lms/patches/v0_0/skill_to_user_skill.py @@ -1,10 +1,8 @@ import frappe + def execute(): frappe.reload_doc("lms", "doctype", "user_skill") skills = frappe.get_all("Skill", pluck="name") for skill in skills: - frappe.get_doc({ - "doctype": "User Skill", - "skill": skill - }).save() + frappe.get_doc({"doctype": "User Skill", "skill": skill}).save()