eduvia/lms
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
pateljannat
2021-05-03 15:51:06 +05:30
parent f13bb494ef 5e18cd2ef4
commit cf68d3127c
11 changed files with 175 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
community/lms/widgets/RequestInvite.html
View File

@@ -1,4 +1,25 @@
<form id="invite-request-form"> <form id="invite-request-form">
<input class="form-control field-width mr-5" id="invite_email" type="email" placeholder="Email Address"> <input class="form-control field-width mr-5" id="invite_email" type="email" placeholder="Email Address">
<a type="submit" id="submit" class="btn btn-primary btn-lg" href="#" role="button">Request Invite</a> <a type="submit" id="submit-invite-request" class="btn btn-primary btn-lg" href="#" role="button">Request Invite</a>
</form> </form>
<script>
frappe.ready(() => {
$("#submit-invite-request").click(function () {
frappe.call({
method: "community.lms.doctype.invite_request.invite_request.create_invite_request",
args: {
invite_email: $("#invite_email").val()
},
callback: (data) => {
if (data.message == "OK") {
$("#invite-request-form").hide();
var message = `<div>
<p class="lead">Thanks for your interest in Mon School. We have recorded your interest and we will get back to you shortly.</p>
</div>`;
$(".jumbotron").append(message);
}
}
})
})
})
</script>

4
community/www/courses/course.html
View File

@@ -111,11 +111,11 @@
{% endfor %} {% endfor %}
</div> </div>
<a class="btn btn-primary add-batch margin-bottom" href="/add-a-new-batch?new=1&course={{course.title}}">Add a new batch</a> <a class="btn btn-primary add-batch margin-bottom" href="/add-a-new-batch?new=1&course={{course.name}}">Add a new batch</a>
{% else %} {% else %}
<div class="mentor_message"> <div class="mentor_message">
<p> You are a mentor for this course. </p> <p> You are a mentor for this course. </p>
<a class="btn btn-primary" href="/add-a-new-batch?new=1&course={{course.title}}" >Create your first batch</a> <a class="btn btn-primary" href="/add-a-new-batch?new=1&course={{course.name}}" >Create your first batch</a>
</div> </div>
{% endif %} {% endif %}
{% endmacro %} {% endmacro %}

19
community/www/home/index.js
View File

@@ -1,19 +0,0 @@
frappe.ready(() => {
$("#submit").click(function () {
frappe.call({
method: "community.lms.doctype.invite_request.invite_request.create_invite_request",
args: {
invite_email: $("#invite_email").val()
},
callback: (data) => {
if (data.message == "OK") {
$("#invite-request-form").hide();
var message = `<div>
<p class="lead">Thanks for your interest in Mon School. We have recorded your interest and we will get back to you shortly.</p>
</div>`;
$(".jumbotron").append(message);
}
}
})
})
})

4
community/www/profiles/profile.py
View File

@@ -1,5 +1,5 @@
import frappe import frappe
from community.lms.models import Sketch from ...lms.doctype.lms_sketch.lms_sketch import get_recent_sketches
def get_context(context): def get_context(context):
context.no_cache = 1 context.no_cache = 1
@@ -8,7 +8,7 @@ def get_context(context):
if not context.member: if not context.member:
context.template = "www/404.html" context.template = "www/404.html"
else: else:
context.sketches = Sketch.get_recent_sketches(context.member.email) context.sketches = list(filter(lambda x: x.owner == context.member.email, get_recent_sketches()))
def get_member(username): def get_member(username):
try: try: