Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,940 Commits 3 Branches 0 Tags 1 GiB
6e1ef4f3d0
Commit Graph

321 Commits

Author SHA1 Message Date
0Pranav
e786eea7db remove comments 2019-12-18 16:25:26 +05:30
0Pranav
84ae2cc543 fix: defualt timezone not getting selected 2019-12-18 15:47:10 +05:30
0Pranav
d3605d2354 fix: issue in javascript timezones 2019-12-11 15:02:23 +05:30
Pranav Nachnekar
6aa763221b fix: rename appointment booking route (#19886) 
* rename appoinment booking route

* fix: replace all references to book-appointment route
 2019-12-10 21:35:28 +05:30
Pranav Nachnekar
ae02b4119d add init.py for appointment modules (#19823) 2019-12-09 19:03:35 +05:30
0Pranav
fb1e87710b Tweaks to success redirect 
- 5 seconds wait before redirect
- Edited description for URL in settings
 2019-11-26 12:14:41 +05:30
0Pranav
511780a4d4 feat: configurable redirect on success 2019-11-14 12:47:08 +05:30
0Pranav
793ba8fc06 pretty timezone names 2019-11-14 11:25:49 +05:30
0Pranav
c31808f5b2 fix margins 2019-11-13 16:47:51 +05:30
0Pranav
6e6954cab8 timezone aware datetime 2019-11-13 16:00:59 +05:30
0Pranav
b1e9fb9e14 fix: buttons on page of appointment scheduling 2019-11-13 15:32:56 +05:30
0Pranav
67f191df4e padding fixes for timeslot divs 2019-11-13 14:14:10 +05:30
0Pranav
c72e1f812d adjust padding for appointment booking 2019-11-13 12:59:05 +05:30
0Pranav
a92f060740 multiple fixes in index.js 2019-11-13 12:13:42 +05:30
0Pranav
f25e2a29f7 fix:formatting 2019-11-13 12:01:36 +05:30
0Pranav
db64c69dac fix: reference before assignement error 2019-11-13 11:12:38 +05:30
0Pranav
83100c9c84 Add comemnts for tz conversions 2019-11-07 13:37:11 +05:30
0Pranav
0671ea8137 use frappe.Redirect instead of DoesNotExistError 2019-11-07 13:31:56 +05:30
0Pranav
76b20a5fa4 crack some one liners 2019-11-07 13:24:59 +05:30
0Pranav
151853b887 remove unneccessary imports 2019-11-07 12:55:43 +05:30
0Pranav
51208b3f0b fix:formatting 2019-11-07 12:54:48 +05:30
0Pranav
75db6f7073 convert indentation to tabs 2019-11-07 12:47:00 +05:30
Pranav Nachnekar
af18b2cdc5
Merge branch 'develop' into scheduling-ui-rewrite 2019-11-04 04:38:59 +00:00
0Pranav
3609872760 rename function 2019-11-01 12:06:42 +05:30
0Pranav
6de68c8671 avoid repetition on get_form date 2019-11-01 09:51:32 +05:30
0Pranav
957c9f5ff0 fix:comments 2019-11-01 09:36:45 +05:30
0Pranav
e494144c96 merge settings fetch, add helpers 2019-10-31 15:38:39 +05:30
0Pranav
d1c530c564 fix: merge settings into one call 2019-10-31 15:36:33 +05:30
rohitwaghchaure
5ff377e2bb fix: product link not working in website (#19373) 2019-10-23 11:09:21 +05:30
0Pranav
ad013264eb fix:margins 2019-10-15 16:45:37 +05:30
0Pranav
7c27436d21 fix:visibilty for forms 2019-10-15 16:45:24 +05:30
0Pranav
29c7d5fc63 fix:margins 2019-10-15 16:43:18 +05:30
Pranav Nachanekar
2c99594688 remove: styles for non existant radio 2019-10-09 15:22:57 +05:30
Pranav Nachanekar
e434e8e2e2 fix: formatting 2019-10-09 14:08:01 +05:30
Pranav Nachanekar
25148d0de5 fix:readability 2019-10-04 11:32:39 +05:30
Pranav Nachanekar
9e36a9ee04 fix: move enable check to serverside 2019-10-04 11:28:29 +05:30
Pranav Nachanekar
faf39ecef4 fix:removed print statements 2019-10-04 11:12:50 +05:30
Pranav Nachanekar
22189ec9e8 remove unnecessary doctype 'Timezone' 2019-10-04 11:07:04 +05:30
Pranav Nachanekar
afe52e8e09 feat: add check for toggling the route 2019-10-03 16:35:08 +05:30
Pranav Nachanekar
59c543570a feat: made timeslots into flex 2019-10-03 13:18:13 +05:30
Pranav Nachanekar
4856645b6d fix:styling for time-slot 2019-10-03 12:45:42 +05:30
Pranav Nachanekar
93670fedda timezone manipulation using pytz 2019-10-03 11:58:02 +05:30
Pranav Nachanekar
c6da5fb38e fix:guess timezone using moment 2019-10-03 11:56:23 +05:30
Pranav Nachanekar
d45c12b382 Formatting 2019-09-24 16:07:02 +05:30
Pranav Nachanekar
c9cf5aebea Changed required values, add clientside validation 2019-09-24 12:08:37 +05:30
Pranav Nachanekar
8b744b2d03 Added request verification and url encoding 2019-09-23 15:55:35 +05:30
Pranav Nachanekar
b6b27d9256 Corrected moving to doctype for email 2019-09-23 14:16:13 +05:30
Pranav Nachanekar
dcfc849946 Moved email to appoitnmetn doctype 2019-09-23 11:52:26 +05:30
Pranav Nachanekar
df1a5a9633 Added flow for verifying emails 2019-09-20 10:08:48 +05:30
Pranav Nachanekar
ba99945359 Prevent booking of appointments for past times 2019-09-19 11:21:05 +05:30
Pranav Nachanekar
7d476a3e35 Moved lead assignment to the controller 2019-09-18 15:33:31 +05:30
Pranav Nachanekar
81449ece54 fix:Linking lead 2019-09-18 14:33:40 +05:30
Pranav Nachanekar
7323bfdad7 Styling and bug fixes 2019-09-18 14:33:10 +05:30
Pranav Nachanekar
91a564989f Styling and PR review changes 2019-09-17 16:58:41 +05:30
Pranav Nachanekar
d88f850d0f removed debugger 2019-09-13 15:56:47 +05:30
Pranav Nachanekar
469247bf73 Change max date of datepicker 
to number of days in future as specified by the settings
 2019-09-12 11:15:42 +05:30
Pranav Nachanekar
a2dbd391b3 Add lead and calender event to appointments 2019-09-12 10:48:26 +05:30
Pranav Nachanekar
a322b159ab Added back button from details page 2019-09-11 14:25:26 +05:30
Pranav Nachanekar
6f486f3719 Addded status to appointment creation 2019-09-10 13:12:28 +05:30
Pranav Nachanekar
5c008ef023 UI Fixes 
Only 8 time slots will appear in a row
Date is more readable on the contact details page
 2019-09-10 13:12:07 +05:30
Pranav Nachanekar
110f4ea0c9 Formatting 2019-09-09 17:04:25 +05:30
Pranav Nachanekar
db21f86b26 Removed unneccessary doctype 2019-09-09 17:01:40 +05:30
Pranav Nachanekar
20c7c290fa Formatting 2019-09-09 16:36:01 +05:30
Pranav Nachanekar
10711dd09d Refactor UI 2019-09-09 15:41:20 +05:30
Pranav Nachanekar
63dbacd7c0 Disabled caching 2019-09-09 15:19:57 +05:30
pranav nachnekar
c5b2a58669 Added submit fucntionality 2019-09-03 14:16:47 +05:30
pranav nachnekar
2791054327 Converted to an SPA 2019-09-03 12:04:52 +05:30
pranav nachnekar
828fea6d66 formatting and date validation 2019-08-30 10:49:57 +05:30
pranav nachnekar
2cd994977b Better date validation 2019-08-30 10:49:43 +05:30
pranav nachnekar
dbd72ea89d Added time generation 2019-08-29 16:56:19 +05:30
pranav nachnekar
7b9e30914f Added doctypes and portal pages 2019-08-28 16:57:37 +05:30
Himanshu
94a0d45b77 fix: do not add an extra day (#18311) 2019-07-15 14:06:50 +05:30
Faris Ansari
b2ab1031e3 fix: Show Clear filters when attribute filters are set 2019-06-14 18:16:14 +05:30
Shivam Mishra
d9aabb83cd
Merge branch 'develop' into lms-link-fix 2019-06-12 17:21:05 +05:30
Shivam Mishra
b94b1febee refactor: topic card redirects to login 2019-06-12 17:20:33 +05:30
Shivam Mishra
147d5d9bf2 fix: redirect to lms home if query params not set 2019-06-12 16:01:02 +05:30
Shivam Mishra
44f98a9a4b fix: back to course button 2019-06-12 15:22:42 +05:30
Shivam Mishra
8af1e87e83 fix: card imqge not visible for courses 2019-06-12 15:16:26 +05:30
Shivam Mishra
278ef4bf73 fix: template fix for null_card 2019-06-12 14:53:00 +05:30
Shivam Mishra
28b2da7850
Merge branch 'develop' into lms-patch-4 2019-06-12 12:51:53 +05:30
Shivam Mishra
8df7e1c215 fix: templates for cards 2019-06-12 12:50:38 +05:30
Shivam Mishra
9510e69910 fix (lms): null cards visible on xs 2019-06-10 10:53:25 +05:30
Shivam Mishra
449f261128 feat: show signup dialog for Guest 2019-06-07 13:34:59 +05:30
Shivam Mishra
8d1117cbee fix: link typo 2019-06-07 13:34:51 +05:30
Shivam Mishra
04d61717bc fix: lms card hero image no visible 2019-06-07 13:34:41 +05:30
Shivam Mishra
d49b5e4736 fix: sql query case fix 2019-06-06 17:19:53 +05:30
Shivam Mishra
2a0483dee3 refactor: styling cards and article 2019-06-06 16:02:38 +05:30
Shivam Mishra
6132c8527b refactor: all programs are shown on home by deafult 2019-06-06 14:19:36 +05:30
Shivam Mishra
098b8324f2 refactor: remove erpnext.com link 2019-06-06 14:14:17 +05:30
Shivam Mishra
b31276572b refactor: styling changes 2019-06-06 14:03:01 +05:30
Shivam Mishra
09cd46fa0b fix: minor bugs 2019-06-06 14:02:49 +05:30
Shivam Mishra
624b4fd5b8 refactor: better sql 2019-06-06 11:30:56 +05:30
Shivam Mishra
f121b51951 fix: import _ in porgram.py 2019-06-05 19:43:51 +05:30
Shivam Mishra
d69892abfa feat: added topic page 2019-06-05 19:42:30 +05:30
Shivam Mishra
2c0e9929fe chore: remove old lms files 2019-06-05 18:30:40 +05:30
Shivam Mishra
c5964b1cf0 fix: minor ui fixes 2019-06-05 18:16:09 +05:30
Shivam Mishra
7597baab95 refactor: minor fixes 2019-06-05 17:49:42 +05:30
Shivam Mishra
bd499fcf27 chore: added session check for profile page 2019-06-05 17:38:12 +05:30
Shivam Mishra
16b4129ede feat: added student profile page 2019-06-05 17:29:48 +05:30
Shivam Mishra
6593263df8 feat: added navigation 2019-06-05 13:34:44 +05:30
Shivam Mishra
570161b978 feat: added course progress apis 2019-06-05 13:08:53 +05:30
Shivam Mishra
6d4c666476 feat: added topic progress api 2019-06-03 14:41:05 +05:30
Shivam Mishra
8ddb63adae feat: added auto course enrollment for enrolled programs 2019-06-03 14:40:52 +05:30
Shivam Mishra
d1a252190b refactor: refactored quiz api and added quiz.js 2019-06-03 12:57:38 +05:30
Shivam Mishra
e94e9d2b06 feat: content navigation and activity tracking working 2019-05-30 18:23:03 +05:30
Shivam Mishra
3336fb595c style: removed console.logs 2019-05-30 18:04:36 +05:30
Shivam Mishra
12579617f3 refactor: added enrolled status to program card 2019-05-30 17:20:31 +05:30
Shivam Mishra
4991fca5cc feat: enabled per student access 2019-05-30 16:37:15 +05:30
Shivam Mishra
24bd07d000 refactor: style changes and template refactor 2019-05-30 16:36:58 +05:30
Shivam Mishra
dfdb92f4b1 refactor: added enrollment api 2019-05-30 16:36:01 +05:30
Shivam Mishra
f22793f91b refactor: added program card macro 2019-05-30 16:34:53 +05:30
Shivam Mishra
f927502cc5 refactor: added lms utilities for enrollment and program list 2019-05-29 18:39:52 +05:30
Shivam Mishra
5aa8df840e refactor: cards and hero markup 2019-05-29 18:38:58 +05:30
Shivam Mishra
63d8cabb3d fix: program card height bug 2019-05-29 15:16:59 +05:30
Shivam Mishra
b7874157f7 refactor: /lms redirects to home if lms is disbaled 2019-05-29 15:15:59 +05:30
Shivam Mishra
ae2871f962 feat: content not visible to guest users 2019-05-29 13:11:34 +05:30
Shivam Mishra
87a7438d38 chore: added macro for page hero 2019-05-21 12:05:19 +05:30
Shivam Mishra
c8c790a097 feat: Added content page and minor doctype changes 2019-05-21 12:04:50 +05:30
Shivam Mishra
d7e8298a5f feat: added program and course pages 2019-05-20 11:55:32 +05:30
Shivam Mishra
823c79588b feat: Moving to Jinja 2019-05-19 16:01:45 +05:30
Shivam Mishra
51b6fe2b8d
feat: Allow disbaling LMS (#17587) 2019-05-14 10:22:15 +05:30
scmmishra
936f36ccda fix: import frappe._ in lms.py 2019-04-22 18:55:19 +05:30
scmmishra
68b3203366 chore: Moved get_quiz_progress and get_program_progress to a class function in program_enrollment 2019-04-22 18:50:08 +05:30
scmmishra
3673b25b64 fix: quiz is now visible to administrator 2019-04-22 18:10:19 +05:30
scmmishra
5079e6c1c1 chore: minor improvements 2019-04-22 14:48:32 +05:30
scmmishra
ac8d3479c9 feat: Added add_quiz_activity function to course_enrollment class 2019-04-22 14:38:51 +05:30
scmmishra
66d239281c chore: minor code improvements 2019-04-22 14:10:09 +05:30
scmmishra
64d2fe0ad7 fix: Minor typo 2019-04-22 12:30:08 +05:30
scmmishra
4add826703 chore: Minor code improvements 
- Changed variable name in `get_content` function
- Added proper exceptions for `get_topic` and `get_content` functions in lms
 2019-04-22 12:28:13 +05:30
scmmishra
da2c90cd18 chore: renamed get_program api functions 
- `get_program` is renamed to `get_program_and_enrollment_status`
- `get_program_detail` is renamed to `get_program`
- Minor code improvements
 2019-04-22 12:21:40 +05:30
scmmishra
9967d27b9a chore: renamed ambiguous variable names in lms.py 2019-04-22 12:08:41 +05:30
scmmishra
d78c326f95 chore: renamed get_topic_meta to get_student_topic_details 2019-04-22 12:06:28 +05:30
scmmishra
d5973fe4bc chore: renamed get_course_meta to get_student_course_details 2019-04-22 12:05:22 +05:30
scmmishra
327334a830 chore: refactor utils.get_current_student 2019-04-22 12:03:17 +05:30
scmmishra
2b7e158e50 feat: Quiz attempt limits is configurable 
- Added a 'no limit' check to `check_quiz_completion` in utils.py
- Added disabled flag for questions in quiz component
- Refactored `get_quiz_without_answers` to send attempt limit data to client
 2019-03-29 12:45:08 +05:30
scmmishra
cea851522f feat: Added custom navbar 2019-03-28 15:33:08 +05:30
scmmishra
9b7ac3e7d2 fix: fixed joining date bug on lms profile 2019-03-28 14:47:22 +05:30
scmmishra
209250ccae fix: Profile page cards 
- Only show attempted quizzes
- Show 0 percent complete if program is enrolled but unattempted
 2019-03-28 14:27:51 +05:30
scmmishra
233db67451 Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2 2019-03-27 18:27:05 +05:30
scmmishra
3d39b88e7c feat: LMS now supports multiple correct choice questions 2019-03-27 18:01:14 +05:30
Faris Ansari
3ba91d7e19 fix: Add /all-products to sitemap 2019-03-20 14:11:22 +05:30
scmmishra
43e9375642 feat [WIP]: Added multiple choice question component 2019-03-20 13:25:02 +05:30
scmmishra
000e706337 feat: Only student progress is recorded in LMS 
Changes
- Instructors can freely audit the course and their progress will not be recorded
- Added check for super access for get_program in utils.py
- Guests can view topics page
- Instructors can see explore topic button
- Content Activity is only saved for a student in lms.py
- Modified variable names in topic.py
 2019-03-19 12:30:43 +05:30
Faris Ansari
5f8b358fd4
Website: Product Configurator and Bootstrap 4 (#15965) 
- Refactored Homepage with customisable Hero Section
- New Homepage Section to add content on Homepage as cards or using Custom HTML
- Products page at "/all-products" with customisable filters
- Item Configure dialog to find an Item Variant filtered by attribute values
- Contact Us dialog on Item page
- Customisable Item page content using the Website Content field
 2019-03-19 11:48:32 +05:30
scmmishra
5c646e60f5 fix: Auto course enrollment for enrolled programs in LMS 2019-03-18 18:37:35 +05:30
scmmishra
621cad8781 fix: Default program list 
Shows two latest programs if no program is set as featured
 2019-03-18 15:40:47 +05:30
scmmishra
c22eef28f7 fix: LMS Title 
Shows default company name if LMS title not set
 2019-03-18 15:36:49 +05:30
scmmishra
bf9a10fd5e chore(style): Renamed a function 2019-03-06 15:45:35 +05:30
scmmishra
ab8fc8c2bf feat: Quizzes fixed 2019-02-28 16:42:37 +05:30
scmmishra
3726f8a7f6 feat: Added check for no content in topic meta 2019-02-28 16:33:53 +05:30