diff --git a/accounts/views.py b/accounts/views.py index 5d4d2205..c6128df3 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -1,10 +1,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin -from django.contrib.auth.decorators import login_required -from django.http import HttpResponseRedirect, HttpResponse, JsonResponse -from django.shortcuts import render, get_object_or_404, redirect -from django.urls import reverse -from django.views.generic import ( - CreateView, UpdateView, DetailView, ListView, TemplateView, View, DeleteView) +from django.http import JsonResponse +from django.shortcuts import get_object_or_404, redirect +from django.views.generic import CreateView, UpdateView, DetailView, TemplateView, View, DeleteView from accounts.models import Account from common.models import User, Address, Team, Comment diff --git a/cases/tests.py b/cases/tests.py index f1c04b09..0f07cf23 100644 --- a/cases/tests.py +++ b/cases/tests.py @@ -2,11 +2,8 @@ from django.test import TestCase from cases.models import Case from contacts.models import Contact from accounts.models import Account -from django.test import Client from common.models import Address -from django.urls import reverse from common.models import User -from django.utils import timezone class CaseCreation(object): @@ -19,23 +16,23 @@ class CaseCreation(object): self.user.save() self.client.login(email='r@mp.com', password='raghu') - self.client.login(email='r@mp.com', password='raghu') self.account = Account.objects.create( - name="account", email="account@gmail.com", phone="12345", - billing_address=self.address, shipping_address=self.address, - website="www.account.com", industry="IT", description="account", - created_by=self.user) + name="account", + email="account@gmail.com", phone="12345", + billing_address=self.address, shipping_address=self.address, + website="www.account.com", industry="IT", description="account", + created_by=self.user) self.contacts = Contact.objects.create( - first_name="contact", email="contact@gmail.com", phone="12345", - account=self.account, description="contact", address=self.address, created_by=self.user) + first_name="contact", email="contact@gmail.com", phone="12345", + account=self.account, description="contact", address=self.address, created_by=self.user) self.case = Case.objects.create( - name="raghu", case_type="Problem", status="New", account=self.account, - priority="Low", description="something", - created_by=self.user, closed_on="2016-05-04") + name="raghu", case_type="Problem", status="New", account=self.account, + priority="Low", description="something", + created_by=self.user, closed_on="2016-05-04") class CaseViewTestCase(CaseCreation, TestCase): @@ -97,5 +94,3 @@ class CaseUpdateTestCase(CaseCreation, TestCase): def test_case_update_html(self): response = self.client.post('/cases/' + str(self.case.id) + '/edit_case/', {'hiddenval': self.case.id}) self.assertTemplateUsed(response, 'create_cases.html') - - diff --git a/cases/views.py b/cases/views.py index 5c2acdd9..8fe2a7ff 100644 --- a/cases/views.py +++ b/cases/views.py @@ -2,9 +2,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.db.models import Q from django.http import JsonResponse from django.shortcuts import get_object_or_404, redirect -from django.urls import reverse -from django.views.generic import ( - CreateView, UpdateView, DetailView, ListView, TemplateView, View, DeleteView) +from django.views.generic import CreateView, UpdateView, DetailView, ListView, TemplateView, View from cases.models import Case from cases.forms import CaseForm, CaseCommentForm diff --git a/common/urls.py b/common/urls.py index 8a9522d3..cb5b5d56 100644 --- a/common/urls.py +++ b/common/urls.py @@ -1,5 +1,3 @@ -from django.conf.urls import url -from common import views from django.contrib.auth import views as auth_views from django.urls import path @@ -28,7 +26,6 @@ urlpatterns = [ path('password-reset/', auth_views.password_reset, name='password_reset'), path('password-reset/done/', auth_views.password_reset_done, name='password_reset_done'), - path('reset/uidb64>//', - auth_views.password_reset_confirm, name='password_reset_confirm'), + path('reset/uidb64>//', auth_views.password_reset_confirm, name='password_reset_confirm'), path('reset/done/', auth_views.password_reset_complete, name='password_reset_complete'), ] diff --git a/common/views.py b/common/views.py index 7684e051..bf7dea1f 100644 --- a/common/views.py +++ b/common/views.py @@ -2,9 +2,8 @@ from django.contrib.auth import logout, authenticate, login from django.contrib.auth.hashers import check_password from django.contrib.auth.mixins import LoginRequiredMixin, AccessMixin from django.http import HttpResponseRedirect -from django.shortcuts import render, redirect, get_object_or_404 -from django.views.generic import ( - CreateView, UpdateView, DetailView, TemplateView, View, DeleteView) +from django.shortcuts import render, redirect +from django.views.generic import CreateView, UpdateView, DetailView, TemplateView, View, DeleteView from common.models import User from common.forms import UserForm, LoginForm, ChangePasswordForm diff --git a/contacts/views.py b/contacts/views.py index dae76a06..97236d16 100644 --- a/contacts/views.py +++ b/contacts/views.py @@ -1,12 +1,9 @@ from django.contrib.auth.mixins import LoginRequiredMixin -from django.db.models import Q from django.http import JsonResponse from django.shortcuts import get_object_or_404, redirect -from django.urls import reverse -from django.views.generic import ( - CreateView, UpdateView, DetailView, ListView, TemplateView, View, DeleteView) +from django.views.generic import CreateView, UpdateView, DetailView, TemplateView, View from accounts.models import Account -from common.models import User, Address, Comment, Team +from common.models import User, Comment, Team from common.forms import BillingAddressForm from common.utils import COUNTRIES from contacts.models import Contact diff --git a/emails/models.py b/emails/models.py index b0567cfd..e93bb5c9 100644 --- a/emails/models.py +++ b/emails/models.py @@ -1,5 +1,5 @@ from django.db import models -from datetime import datetime, timedelta +from datetime import datetime # Create your models here. @@ -15,7 +15,7 @@ class Email(models.Model): important = models.BooleanField(max_length=10, default=False) def __unicode__(self): - return self.timedelta + return self.subject class Meta: ordering = ['-id'] diff --git a/static/js/calls.js b/static/js/calls.js index 1046f321..b0e16d38 100644 --- a/static/js/calls.js +++ b/static/js/calls.js @@ -1,64 +1,64 @@ $(document).ready(function () { - $('.addedFilters .input-group').toggle() + $(".addedFilters .input-group").toggle(); $(function () { - $('.startdatepicker').datetimepicker( + $(".startdatepicker").datetimepicker( { - format: 'MM/DD/YYYY HH:MM:ss' + format: "MM/DD/YYYY HH:MM:ss" } ); }); $("#addreminder").click(function (e) { - e.preventDefault() - forms_count = $(".reminderslist").length + e.preventDefault(); + forms_count = $(".reminderslist").length; // console.log(forms_count) if (forms_count == 0) { - getreminders() + getreminders(); } else { $temp_reminder = $(".reminderslist").first().clone(); copied_html = $temp_reminder.html(); - processed_html = copied_html.replace(/form-\d-/g, "form-" + (forms_count) + "-") + processed_html = copied_html.replace(/form-\d-/g, "form-" + (forms_count) + "-"); // processed_html=copied_html.replace(/form-\d-id/g, "form-" + (forms_count) + "-") - $temp_reminder.html(processed_html) - $(".reminderslist").last().after($temp_reminder) - $(".reminderslist").last().show() + $temp_reminder.html(processed_html); + $(".reminderslist").last().after($temp_reminder); + $(".reminderslist").last().show(); // console.log($(".reminderslist").last()) - $($(".reminderslist").last().children()[0]).removeAttr('disabled') - $($(".reminderslist").last().children()[1]).removeAttr('disabled') - $($(".reminderslist").last().children()[2]).removeAttr('checked') - $($(".reminderslist").last().children()[3]).removeAttr('style') - $($(".reminderslist").last().children()[4]).removeAttr('value') - $("#id_form-TOTAL_FORMS").val($(".reminderslist").length) + $($(".reminderslist").last().children()[0]).removeAttr("disabled"); + $($(".reminderslist").last().children()[1]).removeAttr("disabled"); + $($(".reminderslist").last().children()[2]).removeAttr("checked"); + $($(".reminderslist").last().children()[3]).removeAttr("style"); + $($(".reminderslist").last().children()[4]).removeAttr("value"); + $("#id_form-TOTAL_FORMS").val($(".reminderslist").length); } }); }); $("body").on("click", "button[id=remove]", function (e) { - if ($('.reminderslist').length != 1) { + if ($(".reminderslist").length != 1) { $(this).closest(".reminderslist").remove(); - $("#id_form-TOTAL_FORMS").val($(".reminderslist").length) + $("#id_form-TOTAL_FORMS").val($(".reminderslist").length); } }); -$('body').on('click', '#modeldialogclosed', function () { - $('i[id$=_error]').text('') - $('#call-create-model').modal("hide"); - $('#update-form').attr({"id": "model-form"}) - $('#model-form').find("input[type=text], textarea").val(""); - $('#parent_name').val('') - $('#parent_id').val('') - $('#update').attr("id", "gocreatecall").text('Create'); - $('#updatemodeldialogclosed').attr({"id": "modeldialogclosed"}) +$("body").on("click", "#modeldialogclosed", function () { + $("i[id$=_error]").text(""); + $("#call-create-model").modal("hide"); + $("#update-form").attr({"id": "model-form"}); + $("#model-form").find("input[type=text], textarea").val(""); + $("#parent_name").val(""); + $("#parent_id").val(""); + $("#update").attr("id", "gocreatecall").text("Create"); + $("#updatemodeldialogclosed").attr({"id": "modeldialogclosed"}); }); -$('body').on('click', '#successmodeldialogclosed', function () { - $('#call-success-model').modal("hide"); +$("body").on("click", "#successmodeldialogclosed", function () { + $("#call-success-model").modal("hide"); }); -$('body').on('submit', '#model-form', function (e) { +$("body").on("submit", "#model-form", function (e) { e.preventDefault(); $.post( - '/planner/call/create/', - $('#model-form').serialize(), + "/planner/call/create/", + $("#model-form").serialize(), function (data, status, xhr) { - if (status == 'success') { - if (data['success'] == 'Call Created') { + if (status == "success") { + if (data["success"] == "Call Created") { $("#callslist").prepend('' + '' + data["name"] + '' + '' + data["parent"] + '' + @@ -78,272 +78,271 @@ $('body').on('submit', '#model-form', function (e) { '' + '' + ''); - $('i[id$=_error]').text('') - $('#call-create-model').modal("hide"); - $('#call-success-model').modal("show"); - $('#model-form').find("input[type=text], textarea").val(""); - $('.selected-assigned-users').html('') - $('.selectedcontacts').html('') - $('.selectedusers').html('') - $('#selectedleads').html('') + $("i[id$=_error]").text(""); + $("#call-create-model").modal("hide"); + $("#call-success-model").modal("show"); + $("#model-form").find("input[type=text], textarea").val(""); + $(".selected-assigned-users").html(""); + $(".selectedcontacts").html(""); + $(".selectedusers").html(""); + $("#selectedleads").html(""); } - else if (data['auth'] == 'NO') { - alert('Not Authanticated!!') + else if (data["auth"] == "NO") { + alert("Not Authanticated!!"); //login REDIRECT URL } else { - if (data['success'] != 'Call Created') { + if (data["success"] != "Call Created") { for (a in data) { - $('#' + a + "_error").text(data[a]); - $('#' + a + "_error").css("color", "red"); + $("#" + a + "_error").text(data[a]); + $("#" + a + "_error").css("color", "red"); } } } } - else if (status == 'success') { - console.log(status) + else if (status == "success") { + console.log(status); } } ); }); $("body").on("click", "select input[type=checkbox]", function (e) { - is_match = $(this).attr("name").match(/form-\d+-DELETE/) + is_match = $(this).attr("name").match(/form-\d+-DELETE/); if (is_match) { // $(this).closest(".reminderslist").hide(); - $(this).attr('checked', 'checked') + $(this).attr("checked", "checked"); } }); $("body").on("click", ".removethis", function (e) { - e.preventDefault() - callID = $(this).closest("tr")[0].id - $('#call-delete-model').modal("show"); + e.preventDefault(); + callID = $(this).closest("tr")[0].id; + $("#call-delete-model").modal("show"); }); -$('body').on('click', '#deletecall', function () { - $('#call-delete-model').modal("hide"); +$("body").on("click", "#deletecall", function () { + $("#call-delete-model").modal("hide"); $.post( - '/planner/call/delete/', + "/planner/call/delete/", {callID: callID.match(/\d+/)[0]}, function (data, status, xhr) { - if (status == 'success') { - if (data['success'] == 'Call Deleted') { - $('#' + callID).css({ + if (status == "success") { + if (data["success"] == "Call Deleted") { + $("#" + callID).css({ "background": "#e6f9ff", - }).animate({opacity: '0'}, 2000, function () { + }).animate({opacity: "0"}, 2000, function () { $(this).remove(); }); } - else if (data['auth'] == 'NO') { - alert('Not Authanticated!!') + else if (data["auth"] == "NO") { + alert("Not Authanticated!!"); //login REDIRECT URL } - else if (data['failed' == 'ERROR']) { - alert('ERROR OCCURED!!!\nTry Later.') + else if (data["failed" == "ERROR"]) { + alert("ERROR OCCURED!!!\nTry Later."); } } - else if (status == 'error') { + else if (status == "error") { console.log(jqXhr); - if (data['error'] == 'Something Went Wrong!!!') { - window.location = '/'; - console.log('Something Went Wrong!!!') + if (data["error"] == "Something Went Wrong!!!") { + window.location = "/"; } else { - console.log(status) + console.log(status); } } }); }); $("body").on("click", ".viewthis", function (e, from_edit_this) { - e.preventDefault() - callID = $(this).closest("tr")[0].id - call = callID.match(/\d+/)[0] - $('#model-form').append(''); - $('#gocreatecall').attr("id", "editcall").text('Edit'); - $('#selectedleads').html('') - $('#selectedcontacts').html('') - $('#selected-assignee-users').html('') - $('#selectedusers').html('') + e.preventDefault(); + callID = $(this).closest("tr")[0].id; + call = callID.match(/\d+/)[0]; + $("#model-form").append(""); + $("#gocreatecall").attr("id", "editcall").text("Edit"); + $("#selectedleads").html(""); + $("#selectedcontacts").html(""); + $("#selected-assignee-users").html(""); + $("#selectedusers").html(""); $.post( - '/planner/get/call/', + "/planner/get/call/", {callID: callID.match(/\d+/)[0]}, function (data, status, xhr) { // console.log(data) - if (status == 'success') { - if (data['call']['event_type'] == 'Call') { - $('#name').val(data['call']['name']) - $('#parent').val(data['call']['parent']) - $('#status').val(data['call']['status']) - $('#start_date').val(data['call']['start_date']) - $('#close_date').val(data['call']['close_date']) - $('#duration').val(data['call']['duration']) - $('#description').val(data['call']['description']) - $('#parent_name').val(data['parent_name']) - $('#parent_id').val(data['parent_id']) - $('#parent_type').val(data['parent_type']) - $('#teams').val(data['call']['teams']) - getOtherFields(data) + if (status == "success") { + if (data["call"]["event_type"] == "Call") { + $("#name").val(data["call"]["name"]); + $("#parent").val(data["call"]["parent"]); + $("#status").val(data["call"]["status"]); + $("#start_date").val(data["call"]["start_date"]); + $("#close_date").val(data["call"]["close_date"]); + $("#duration").val(data["call"]["duration"]); + $("#description").val(data["call"]["description"]); + $("#parent_name").val(data["parent_name"]); + $("#parent_id").val(data["parent_id"]); + $("#parent_type").val(data["parent_type"]); + $("#teams").val(data["call"]["teams"]); + getOtherFields(data); // reminders = JSON.parse(data['reminders']) - remindersHTML = data.remindersHTML.replace("b'", "") - remindersHTML.replace("'", "") - remindersHTML = remindersHTML.replace(/\\n/g, '') - remindersHTML = remindersHTML.replace(/'/g, '') - $("#reminder1").replaceWith(remindersHTML) - $("#reminder1").show() + remindersHTML = data.remindersHTML.replace("b'", ""); + remindersHTML.replace("'", ""); + remindersHTML = remindersHTML.replace(/\\n/g, ''); + remindersHTML = remindersHTML.replace(/'/g, ''); + $("#reminder1").replaceWith(remindersHTML); + $("#reminder1").show(); if (from_edit_this != true) { // alert(from_edit_this) - $('.reminderslist select').attr('disabled', true) - $('.glyphicon-plus').hide() - $('.glyphicon-trash').hide() + $(".reminderslist select").attr("disabled", true); + $(".glyphicon-plus").hide(); + $(".glyphicon-trash").hide(); } } - else if (data['failed'] == 'ERROR') { - alert(data['failed']) + else if (data["failed"] == "ERROR") { + alert(data["failed"]); //login REDIRECT URL } - else if (data['AUTH'] == 'NO') { - alert('Not Authanticated') + else if (data["AUTH"] == "NO") { + alert("Not Authanticated"); //login redirect } } - else if (status == 'error') { + else if (status == "error") { console.log(jqXhr); } else { - console.log(status) + console.log(status); } }); - $('#call-create-model').modal("show"); - $('.modal-body :input').attr("disabled", true); + $("#call-create-model").modal("show"); + $(".modal-body :input").attr("disabled", true); }); $("body").on("click", "#editcall", function (e) { e.preventDefault(); - $('.modal-body :input').removeAttr('disabled') - $('.reminderslist select').removeAttr('disabled') - $('.glyphicon-plus').show() - $('.glyphicon-trash').show() - $('#model-form').attr({"id": "update-form", "type": "submit"}); - $('#editcall').attr({"id": "update", "type": "submit"}).text('Update'); - $('#modeldialogclosed').attr({"id": "modeldialogclosed"}); - $('#modelbody').append('') + $(".modal-body :input").removeAttr("disabled"); + $(".reminderslist select").removeAttr("disabled"); + $(".glyphicon-plus").show(); + $(".glyphicon-trash").show(); + $("#model-form").attr({"id": "update-form", "type": "submit"}); + $("#editcall").attr({"id": "update", "type": "submit"}).text("Update"); + $("#modeldialogclosed").attr({"id": "modeldialogclosed"}); + $("#modelbody").append(""); }); $("body").on("click", "#updatemodeldialogclosed", function (e) { e.preventDefault(); - $('i[id$=_error]').text('') - $('#call-create-model').modal("hide"); - $('#update').attr({"id": "create", "type": "submit"}).text('Create'); - $('#model-form').find("input[type=text], textarea").val(""); - $('#update-form').attr({"id": "model-form"}) - $('#updatemodeldialogclosed').attr({"id": "model-form"}) - $(".reminderslist[style='display:inline-flex']").remove(); + $("i[id$=_error]").text("") + $("#call-create-model").modal("hide"); + $("#update").attr({"id": "create", "type": "submit"}).text("Create"); + $("#model-form").find("input[type=text], textarea").val(""); + $("#update-form").attr({"id": "model-form"}); + $("#updatemodeldialogclosed").attr({"id": "model-form"}); + $(".reminderslist[style="display:inline-flex"]").remove(); }); $("body").on("click", "#createcall", function (e) { - $('.modal-body :input').removeAttr('disabled') - $('#gocreatecall').attr("id", "gocreatecall").text('Create'); - $('#editcall').attr("id", "gocreatecall").text('Create'); - $('#model-form').find("input[type=text], textarea").val(""); - $('#parent_name').val('') - $('#parent_id').val('') - $('#selectedleads').html('') - $('#selectedcontacts').html('') - $('#selected-assignee-users').html('') - $('#selectedusers').html('') + $(".modal-body :input").removeAttr("disabled"); + $("#gocreatecall").attr("id", "gocreatecall").text("Create"); + $("#editcall").attr("id", "gocreatecall").text("Create"); + $("#model-form").find("input[type=text], textarea").val(""); + $("#parent_name").val(""); + $("#parent_id").val(""); + $("#selectedleads").html(""); + $("#selectedcontacts").html(""); + $("#selected-assignee-users").html(""); + $("#selectedusers").html(""); getreminders() }); -$('body').on('submit', '#update-form', function (e) { +$("body").on("submit", "#update-form", function (e) { e.preventDefault(); $.post( - '/planner/call/update/', - $('#update-form').serialize(), + "/planner/call/update/", + $("#update-form").serialize(), function (data, status, xhr) { - if (status == 'success') { - if (data['success'] == 'Call Updated') { - $('#call' + data["id"] + 'name').text(data["name"]); - $('#call' + data["id"] + 'parent').text(data["parent"]); - $('#call' + data["id"] + 'status').text(data["status"]); - $('#call' + data["id"] + 'startdate').text(data["startdate"]); - $('i[id$=_error]').text('') - $('#call-create-model').modal("hide"); - $('#update').attr({"id": "gocreatecall", "type": "submit"}).text('Create'); - $('#update-form').attr({"id": "model-form"}) - $('#model-form').find("input[type=text], textarea").val(""); - $('#updatemodeldialogclosed').attr({"id": "modeldialogclosed"}) - $(".reminderslist[style='display:inline-flex']").remove(); - $('.selected-assigned-users').html('') - $('.selectedcontacts').html('') - $('.selectedusers').html('') - $('#selectedleads').html('') + if (status == "success") { + if (data["success"] == "Call Updated") { + $("#call" + data["id"] + "name").text(data["name"]); + $("#call" + data["id"] + "parent").text(data["parent"]); + $("#call" + data["id"] + "status").text(data["status"]); + $("#call" + data["id"] + "startdate").text(data["startdate"]); + $("i[id$=_error]").text(""); + $("#call-create-model").modal("hide"); + $("#update").attr({"id": "gocreatecall", "type": "submit"}).text("Create"); + $("#update-form").attr({"id": "model-form"}); + $("#model-form").find("input[type=text], textarea").val(""); + $("#updatemodeldialogclosed").attr({"id": "modeldialogclosed"}); + $(".reminderslist[style="display:inline-flex"]").remove(); + $(".selected-assigned-users").html(""); + $(".selectedcontacts").html(""); + $(".selectedusers").html(""); + $("#selectedleads").html(""); } - else if (data['auth'] == 'NO') { - alert('Not Authanticated!!') - window.location='/' + else if (data["auth"] == "NO") { + alert("Not Authanticated!!"); + window.location="/"; //login REDIRECT URL } else { // resp = JSON.parse(data); - if (data['success'] != 'Meeting Updated') { + if (data["success"] != "Meeting Updated") { for (a in data) { - $('#' + a + "_error").text(data[a]); - $('#' + a + "_error").css("color", "red"); + $("#" + a + "_error").text(data[a]); + $("#" + a + "_error").css("color", "red"); } } } } - else if (status == 'error') { + else if (status == "error") { console.log(jqXhr); - if (data['error'] == 'Something Went Wrong!!!') { + if (data["error"] == "Something Went Wrong!!!") { - window.location = '/'; - console.log('Something Went Wrong!!!') + window.location = "/"; + console.log("Something Went Wrong!!!"); } } else { - console.log(status) + console.log(status); } }); }); -$('body').on('click', '.editthis', function (e) { - $($(this).parent().siblings()[0]).children().trigger('click', true) - $('#editcall').trigger('click') +$("body").on("click", ".editthis", function (e) { + $($(this).parent().siblings()[0]).children().trigger("click", true); + $("#editcall").trigger("click"); }); function getreminders() { $.get( - '/planner/get/reminders/', - $('#update-form').serialize(), + "/planner/get/reminders/", + $("#update-form").serialize(), function (data, status, xhr) { - if (status == 'success') { + if (status == "success") { // console.log(data) - $("#reminder1").replaceWith(data) - if (data['auth'] == 'NO') { - alert('Not Authanticated!!') + $("#reminder1").replaceWith(data); + if (data["auth"] == "NO") { + alert("Not Authanticated!!"); //login REDIRECT URL } } - if (status == 'error') { + if (status == "error") { console.log(jqXhr); - if (data['error'] == 'Something Went Wrong!!!') { - alert('We Regret, there is an issue!! Try again.') - window.location = '/'; - console.log('Something Went Wrong!!!') + if (data["error"] == "Something Went Wrong!!!") { + alert("We Regret, there is an issue!! Try again."); + window.location = "/"; + console.log("Something Went Wrong!!!"); } } else { - console.log(status) + console.log(status); } }); } $.ajaxSetup({ beforeSend: function (xhr, settings) { - if (settings.type == 'POST' || settings.type == 'PUT' || settings.type == 'DELETE') { + if (settings.type == "POST" || settings.type == "PUT" || settings.type == "DELETE") { if (!(/^http:.*/.test(settings.url) || /^https:.*/.test(settings.url))) { } diff --git a/static/js/meetings.js b/static/js/meetings.js index 94f3be2a..c0fd313a 100644 --- a/static/js/meetings.js +++ b/static/js/meetings.js @@ -1,5 +1,5 @@ $(document).ready(function () { - $('.addedFilters .input-group').toggle() + $(".addedFilters .input-group").toggle() $("#addreminder").click(function (e) { e.preventDefault() forms_count = $(".reminderslist").length @@ -15,59 +15,59 @@ $(document).ready(function () { $(".reminderslist").last().after($temp_reminder) $(".reminderslist").last().show() // console.log($(".reminderslist").last()) - $('#' + $(".reminderslist").last().children()[0].id).removeAttr('disabled') - $('#' + $(".reminderslist").last().children()[1].id).removeAttr('disabled') - $('#' + $(".reminderslist").last().children()[2].id).removeAttr('checked') - $('#' + $(".reminderslist").last().children()[3].id).removeAttr('style') - $('#' + $(".reminderslist").last().children()[4].id).removeAttr('value') + $("#" + $(".reminderslist").last().children()[0].id).removeAttr("disabled") + $("#" + $(".reminderslist").last().children()[1].id).removeAttr("disabled") + $("#" + $(".reminderslist").last().children()[2].id).removeAttr("checked") + $("#" + $(".reminderslist").last().children()[3].id).removeAttr("style") + $("#" + $(".reminderslist").last().children()[4].id).removeAttr("value") $("#id_form-TOTAL_FORMS").val($(".reminderslist").length) } }); $(function () { - $('.startdatepicker').datetimepicker( + $(".startdatepicker").datetimepicker( { - format: 'MM/DD/YYYY HH:MM:ss' + format: "MM/DD/YYYY HH:MM:ss" } ); - $('.enddatepicker').datetimepicker({ + $(".enddatepicker").datetimepicker({ useCurrent: false, - format: 'MM/DD/YYYY HH:MM:ss' + format: "MM/DD/YYYY HH:MM:ss" }); $(".startdatepicker").on("dp.change", function (e) { - $('.enddatepicker').data("DateTimePicker").minDate(e.date); + $(".enddatepicker").data("DateTimePicker").minDate(e.date); }); $(".enddatepicker").on("dp.change", function (e) { - $('.startdatepicker ').data("DateTimePicker").maxDate(e.date); + $(".startdatepicker ").data("DateTimePicker").maxDate(e.date); }); }); }); -$('body').on('click', '#modeldialogclosed', function () { - $('i[id$=_error]').text('') - $('#meeting-create-model').modal("hide"); - $('#update-form').attr({"id": "model-form"}) - $('#model-form').find("input[type=text], textarea").val(""); - $('.parent_name').val('') - $('.parent_id').val('') - $('#update').attr("id", "gocreatemeeting").text('Create'); +$("body").on("click", "#modeldialogclosed", function () { + $("i[id$=_error]").text("") + $("#meeting-create-model").modal("hide"); + $("#update-form").attr({"id": "model-form"}) + $("#model-form").find("input[type=text], textarea").val(""); + $(".parent_name").val("") + $(".parent_id").val("") + $("#update").attr("id", "gocreatemeeting").text("Create"); getreminders() - $('#updatemodeldialogclosed').attr({"id": "modeldialogclosed"}) + $("#updatemodeldialogclosed").attr({"id": "modeldialogclosed"}) }); -$('body').on('click', '#successmodeldialogclosed', function () { - $('#meeting-success-model').modal("hide"); - $('.parent_name').val('') +$("body").on("click", "#successmodeldialogclosed", function () { + $("#meeting-success-model").modal("hide"); + $(".parent_name").val("") }); -$('body').on('submit', '#model-form', function (e) { +$("body").on("submit", "#model-form", function (e) { e.preventDefault(); - // console.log($('#model-form').serialize()) + // console.log($("#model-form").serialize()) $.post( - '/planner/meeting/create/', - $('#model-form').serialize(), + "/planner/meeting/create/", + $("#model-form").serialize(), function (data, status, xhr) { - if (status == 'success') { - if (data['success'] == 'Meeting Created') { + if (status == "success") { + if (data["success"] == "Meeting Created") { $("#meetingslist").prepend('' + '' + data["name"] + '' + '' + data["parent"] + '' + @@ -87,37 +87,37 @@ $('body').on('submit', '#model-form', function (e) { '' + '' + ''); - $('i[id$=_error]').text('') - $('#meeting-create-model').modal("hide"); - $('#meeting-success-model').modal("show"); - $('#model-form').find("input[type=text], textarea").val(""); - $('#selectedleads').html('') - $('.selectedcontacts').html('') - $('.selectedusers').html('') - $('#assignaed_user').html('') + $("i[id$=_error]").text("") + $("#meeting-create-model").modal("hide"); + $("#meeting-success-model").modal("show"); + $("#model-form").find("input[type=text], textarea").val(""); + $("#selectedleads").html("") + $(".selectedcontacts").html("") + $(".selectedusers").html("") + $("#assignaed_user").html("") } - else if (data['auth'] == 'NO') { - alert('Not Authanticated!!') + else if (data["auth"] == "NO") { + alert("Not Authanticated!!") //login REDIRECT URL } else { // console.log("Meeting Not Created") // resp = JSON.parse(data); - if (data['success'] != 'Meeting Created') { + if (data["success"] != "Meeting Created") { for (a in data) { - $('#' + a + "_error").text(data[a]); - $('#' + a + "_error").css("color", "red"); + $("#" + a + "_error").text(data[a]); + $("#" + a + "_error").css("color", "red"); } } } } - else if (status == 'error') { + else if (status == "error") { console.log(jqXhr); - if (data['error'] == 'Something Went Wrong!!!') { + if (data["error"] == "Something Went Wrong!!!") { - window.location = '/'; - console.log('Something Went Wrong!!!') + window.location = "/"; + console.log("Something Went Wrong!!!") } } else { @@ -129,42 +129,42 @@ $("body").on("click", "#reminders input[type=checkbox]", function (e) { is_match = $(this).attr("name").match(/form-\d+-DELETE/) if (is_match) { // $(this).closest(".reminderslist").hide(); - $(this).attr('checked', 'checked') + $(this).attr("checked", "checked") } }); $("body").on("click", ".removethis", function (e) { e.preventDefault() meetingID = $(this).closest("tr")[0].id - $('#meeting-delete-model').modal("show"); + $("#meeting-delete-model").modal("show"); }); -$('body').on('click', '#deletemeeting', function () { - $('#meeting-delete-model').modal("hide"); +$("body").on("click", "#deletemeeting", function () { + $("#meeting-delete-model").modal("hide"); $.post( - '/planner/meeting/delete/', + "/planner/meeting/delete/", {meetingID: meetingID.match(/\d+/)[0]}, function (data, status, xhr) { - if (status == 'success') { - if (data['success'] == 'Meeting Deleted') { - $('#' + meetingID).css({ + if (status == "success") { + if (data["success"] == "Meeting Deleted") { + $("#" + meetingID).css({ "background": "#e6f9ff", - }).animate({opacity: '0'}, 2000, function () { + }).animate({opacity: "0"}, 2000, function () { $(this).remove(); }); } - else if (data['auth'] == 'NO') { - alert('Not Authanticated!!') + else if (data["auth"] == "NO") { + alert("Not Authanticated!!") //login REDIRECT URL } - else if (data['failed' == 'ERROR']) { - alert('ERROR OCCURED!!!\nTry Later.') + else if (data["failed" == "ERROR"]) { + alert("ERROR OCCURED!!!\nTry Later.") } } - else if (status == 'error') { + else if (status == "error") { console.log(jqXhr); - if (data['error'] == 'Something Went Wrong!!!') { - window.location = '/'; - console.log('Something Went Wrong!!!') + if (data["error"] == "Something Went Wrong!!!") { + window.location = "/"; + console.log("Something Went Wrong!!!") } else { @@ -175,31 +175,31 @@ $('body').on('click', '#deletemeeting', function () { }); $("body").on("click", ".viewthis", function (e, from_edit_this) { e.preventDefault() - $('#selectedleads').html('') - $('.selectedcontacts').html('') - $('.selected-assignee-users').html('') - $('.selectedusers').html('') + $("#selectedleads").html("") + $(".selectedcontacts").html("") + $(".selected-assignee-users").html("") + $(".selectedusers").html("") meetingID = $(this).closest("tr")[0].id meet = meetingID.match(/\d+/)[0] - $('#model-form').append(''); - $('#gocreatemeeting').attr("id", "editmeeting").text('Edit'); + $("#model-form").append(""); + $("#gocreatemeeting").attr("id", "editmeeting").text("Edit"); $.post( - '/planner/get/meeting/', + "/planner/get/meeting/", {meetingID: meetingID.match(/\d+/)[0]}, function (data, status, xhr) { // console.log(data) - if (status == 'success') { - if (data['meeting']['event_type'] == 'Meeting') { - $('#name').val(data['meeting']['name']) - $('#status').val(data['meeting']['status']) - $('#start_date').val(data['meeting']['start_date']) - $('#close_date').val(data['meeting']['close_date']) - $('#duration').val(data['meeting']['duration']) - $('#description').val(data['meeting']['description']) - $('#meeting-create-model .parent_name').val(data['parent_name']) - $('#meeting-create-model .parent_id').val(data['parent_id']) - $('#meeting-create-model .parent_type').val(data['parent_type']) - $('#teams').val(data['meeting']['teams']) + if (status == "success") { + if (data["meeting"]["event_type"] == "Meeting") { + $("#name").val(data["meeting"]["name"]) + $("#status").val(data["meeting"]["status"]) + $("#start_date").val(data["meeting"]["start_date"]) + $("#close_date").val(data["meeting"]["close_date"]) + $("#duration").val(data["meeting"]["duration"]) + $("#description").val(data["meeting"]["description"]) + $("#meeting-create-model .parent_name").val(data["parent_name"]) + $("#meeting-create-model .parent_id").val(data["parent_id"]) + $("#meeting-create-model .parent_type").val(data["parent_type"]) + $("#teams").val(data["meeting"]["teams"]) getOtherFields(data) remindersHTML = data.remindersHTML.replace("b'", "") @@ -209,22 +209,22 @@ $("body").on("click", ".viewthis", function (e, from_edit_this) { $("#reminder1").replaceWith(remindersHTML) $("#reminder1").show() if (from_edit_this != true) { - $('.reminderslist select').attr('disabled', true) - $('.glyphicon-plus').hide() - $('.glyphicon-trash').hide() + $(".reminderslist select").attr("disabled", true) + $(".glyphicon-plus").hide() + $(".glyphicon-trash").hide() } } - else if (data['failed'] == 'ERROR') { - alert(data['failed']) + else if (data["failed"] == "ERROR") { + alert(data["failed"]) //login REDIRECT URL } - else if (data['AUTH'] == 'NO') { - alert('Not Authanticated') + else if (data["AUTH"] == "NO") { + alert("Not Authanticated") //login redirect } } - else if (status == 'error') { + else if (status == "error") { console.log(jqXhr); } @@ -232,94 +232,94 @@ $("body").on("click", ".viewthis", function (e, from_edit_this) { console.log(status) } }); - $('#meeting-create-model').modal("show"); - $('.modal-body :input').attr("disabled", true); + $("#meeting-create-model").modal("show"); + $(".modal-body :input").attr("disabled", true); }); $("body").on("click", "#editmeeting", function (e) { e.preventDefault(); - $('.modal-body :input').removeAttr('disabled') - $('.reminderslist select').removeAttr('disabled') - $('.glyphicon-plus').show() - $('.glyphicon-trash').show() - $('#model-form').attr({"id": "update-form", "type": "submit"}); - $('#editmeeting').attr({"id": "update", "type": "submit"}).text('Update'); - $('#modeldialogclosed').attr({"id": "modeldialogclosed"}); - $('#modelbody').append('') + $(".modal-body :input").removeAttr("disabled") + $(".reminderslist select").removeAttr("disabled") + $(".glyphicon-plus").show() + $(".glyphicon-trash").show() + $("#model-form").attr({"id": "update-form", "type": "submit"}); + $("#editmeeting").attr({"id": "update", "type": "submit"}).text("Update"); + $("#modeldialogclosed").attr({"id": "modeldialogclosed"}); + $("#modelbody").append("") }); $("body").on("click", "#updatemodeldialogclosed", function (e) { e.preventDefault(); - $('i[id$=_error]').text('') - $('#meeting-create-model').modal("hide"); - $('#update').attr({"id": "create", "type": "submit"}).text('Create'); - $('#model-form').find("input[type=text], textarea").val(""); - $('#update-form').attr({"id": "model-form"}) - $('#updatemodeldialogclosed').attr({"id": "model-form"}) - $(".reminderslist[style='display:inline-flex']").remove(); + $("i[id$=_error]").text("") + $("#meeting-create-model").modal("hide"); + $("#update").attr({"id": "create", "type": "submit"}).text("Create"); + $("#model-form").find("input[type=text], textarea").val(""); + $("#update-form").attr({"id": "model-form"}) + $("#updatemodeldialogclosed").attr({"id": "model-form"}) + $(".reminderslist[style="display:inline-flex"]").remove(); }); $("body").on("click", "#createmeeting", function (e) { - $('.modal-body :input').removeAttr('disabled') - $('#gocreatemeeting').attr("id", "gocreatemeeting").text('Create'); - $('#editmeeting').attr("id", "gocreatemeeting").text('Create'); - $('#model-form').find("input[type=text], textarea").val(""); - $('#parent_name').val('') - $('#parent_id').val('') - $('#selectedleads').html('') - $('.selectedcontacts').html('') - $('.selected-assignee-users').html('') - $('.selectedusers').html('') - // $('#update').attr("id", "gocreatemeeting").text('Create'); + $(".modal-body :input").removeAttr("disabled") + $("#gocreatemeeting").attr("id", "gocreatemeeting").text("Create"); + $("#editmeeting").attr("id", "gocreatemeeting").text("Create"); + $("#model-form").find("input[type=text], textarea").val(""); + $("#parent_name").val("") + $("#parent_id").val("") + $("#selectedleads").html("") + $(".selectedcontacts").html("") + $(".selected-assignee-users").html("") + $(".selectedusers").html("") + // $("#update").attr("id", "gocreatemeeting").text("Create"); getreminders() }); -$('body').on('submit', '#update-form', function (e) { +$("body").on("submit", "#update-form", function (e) { e.preventDefault(); $.post( - '/planner/meeting/update/', - $('#update-form').serialize(), + "/planner/meeting/update/", + $("#update-form").serialize(), function (data, status, xhr) { - if (status == 'success') { - if (data['success'] == 'Meeting Updated') { - $('#meeting' + data["id"] + 'name').text(data["name"]); - $('#meeting' + data["id"] + 'parent').text(data["parent"]); - $('#meeting' + data["id"] + 'startdate').text(data["startdate"]); - $('i[id$=_error]').text('') - $('#meeting-create-model').modal("hide"); - $('#update').attr({"id": "gocreatemeeting", "type": "submit"}).text('Create'); + if (status == "success") { + if (data["success"] == "Meeting Updated") { + $("#meeting" + data["id"] + "name").text(data["name"]); + $("#meeting" + data["id"] + "parent").text(data["parent"]); + $("#meeting" + data["id"] + "startdate").text(data["startdate"]); + $("i[id$=_error]").text("") + $("#meeting-create-model").modal("hide"); + $("#update").attr({"id": "gocreatemeeting", "type": "submit"}).text("Create"); - $('#update-form').attr({"id": "model-form"}) - $('#model-form').find("input[type=text], textarea").val(""); - $('#updatemodeldialogclosed').attr({"id": "modeldialogclosed"}) - $(".reminderslist[style='display:inline-flex']").remove(); + $("#update-form").attr({"id": "model-form"}) + $("#model-form").find("input[type=text], textarea").val(""); + $("#updatemodeldialogclosed").attr({"id": "modeldialogclosed"}) + $(".reminderslist[style="display:inline-flex"]").remove(); } - else if (data['auth'] == 'NO') { - alert('Not Authanticated!!') + else if (data["auth"] == "NO") { + alert("Not Authanticated!!") //login REDIRECT URL } else { // console.log("Meeting Not Created") // resp = JSON.parse(data); - if (data['success'] != 'Meeting Updated') { + if (data["success"] != "Meeting Updated") { for (a in data) { - if (data[a] == 'Please correct the duplicate values below.') { - data[a] = 'Please remove duplicate Reminders.' + if (data[a] == "Please correct the duplicate values below.") { + data[a] = "Please remove duplicate Reminders." } - $('#' + a + "_error").text(data[a]); - $('#' + a + "_error").css("color", "red"); + $("#" + a + "_error").text(data[a]); + $("#" + a + "_error").css("color", "red"); } } } } - else if (status == 'error') { + else if (status == "error") { console.log(jqXhr); - if (data['error'] == 'Something Went Wrong!!!') { + if (data["error"] == "Something Went Wrong!!!") { - window.location = '/'; - console.log('Something Went Wrong!!!') + window.location = "/"; + console.log("Something Went Wrong!!!") } } else { @@ -327,35 +327,35 @@ $('body').on('submit', '#update-form', function (e) { } }); }); -$('body').on('click', '.editthis', function (e) { +$("body").on("click", ".editthis", function (e) { e.preventDefault() - $($(this).parent().siblings()[0]).children().trigger('click', true) - $('#editmeeting').trigger('click') - $('#selectedleads').html('') - $('.selectedcontacts').html('') - $('.selectedusers').html('') - $('#assignaed_user').html('') + $($(this).parent().siblings()[0]).children().trigger("click", true) + $("#editmeeting").trigger("click") + $("#selectedleads").html("") + $(".selectedcontacts").html("") + $(".selectedusers").html("") + $("#assignaed_user").html("") }); function getreminders() { $.get( - '/planner/get/reminders/', - $('#update-form').serialize(), + "/planner/get/reminders/", + $("#update-form").serialize(), function (data, status, xhr) { - if (status == 'success') { + if (status == "success") { // console.log(data) $("#reminder1").replaceWith(data) - if (data['auth'] == 'NO') { - alert('Not Authanticated!!') + if (data["auth"] == "NO") { + alert("Not Authanticated!!") //login REDIRECT URL } } - if (status == 'error') { + if (status == "error") { console.log(jqXhr); - if (data['error'] == 'Something Went Wrong!!!') { - alert('We Regret, there is an issue!! Try again.') - window.location = '/'; - console.log('Something Went Wrong!!!') + if (data["error"] == "Something Went Wrong!!!") { + alert("We Regret, there is an issue!! Try again.") + window.location = "/"; + console.log("Something Went Wrong!!!") } } else { @@ -366,7 +366,7 @@ function getreminders() { $.ajaxSetup({ beforeSend: function (xhr, settings) { - if (settings.type == 'POST' || settings.type == 'PUT' || settings.type == 'DELETE') { + if (settings.type == "POST" || settings.type == "PUT" || settings.type == "DELETE") { if (!(/^http:.*/.test(settings.url) || /^https:.*/.test(settings.url))) { } diff --git a/static/js/tasks.js b/static/js/tasks.js index 71f8e5c6..4f922b54 100644 --- a/static/js/tasks.js +++ b/static/js/tasks.js @@ -45,13 +45,13 @@ $('body').on('submit', '#model-form', function (e) { '' + '' + ''); - $("i[id$=_error]").text("") + $("i[id$=_error]").text(""); $("#task-create-model").modal("hide"); $("#task-success-model").modal("show"); $("#model-form").find("input[type=text], textarea").val(""); } else if (data["auth"] == "NO") { - alert("Not Authanticated!!") + alert("Not Authanticated!!"); //login REDIRECT URL } else { @@ -69,14 +69,14 @@ $('body').on('submit', '#model-form', function (e) { }); }); $("body").on("click", "#modeldialogclosed", function () { - $("i[id$=_error]").text("") + $("i[id$=_error]").text(""); $("#task-create-model").modal("hide"); - $("#update-form").attr({"id": "model-form"}) + $("#update-form").attr({"id": "model-form"}); $("#model-form").find("input[type=text], textarea").val(""); - $("#parent_name").val("") - $("#parent_id").val("") + $("#parent_name").val(""); + $("#parent_id").val(""); $("#update").attr("id", "gocreatetask").text("Create"); - $("#updatemodeldialogclosed").attr({"id": "modeldialogclosed"}) + $("#updatemodeldialogclosed").attr({"id": "modeldialogclosed"}); }); @@ -85,8 +85,8 @@ $("body").on("click", "#successmodeldialogclosed", function () { }); $("body").on("click", ".removethis", function (e) { - e.preventDefault() - taskID = $(this).closest("tr")[0].id + e.preventDefault(); + taskID = $(this).closest("tr")[0].id; $.post( "/planner/task/delete/", {taskID: taskID.match(/\d+/)[0]}, @@ -100,11 +100,11 @@ $("body").on("click", ".removethis", function (e) { }); } else if (data["auth"] == "NO") { - alert("Not Authanticated!!") + alert("Not Authanticated!!"); //login REDIRECT URL } else if (data["failed" == "ERROR"]) { - alert("ERROR OCCURED!!!\nTry Later.") + alert("ERROR OCCURED!!!\nTry Later."); } } @@ -112,19 +112,19 @@ $("body").on("click", ".removethis", function (e) { console.log(jqXhr); if (data["error"] == "Something Went Wrong!!!") { window.location = "/"; - console.log("Something Went Wrong!!!") + console.log("Something Went Wrong!!!"); } else { - console.log(status) + console.log(status); } } }); }); $("body").on("click", ".viewthis", function (e) { - e.preventDefault() - taskID = $(this).closest("tr")[0].id - task = taskID.match(/\d+/)[0] + e.preventDefault(); + taskID = $(this).closest("tr")[0].id; + task = taskID.match(/\d+/)[0]; $("#model-form").append(""); $("#gocreatetask").attr("id", "edittask").text("Edit"); $.post( @@ -134,37 +134,37 @@ $("body").on("click", ".viewthis", function (e) { // console.log(data) if (status == "success") { if (data["task"]["event_type"] == "Task") { - $("#name").val(data["task"]["name"]) - $("#parent").val(data["task"]["parent"]) - $("#status").val(data["task"]["status"]) - $("#priority").val(data["task"]["priority"]) - $("#start_date").val(data["task"]["start_date"]) - $("#close_date").val(data["task"]["close_date"]) - $("#description").val(data["task"]["description"]) - $("#parent_name").val(data["parent_name"]) - $("#parent_id").val(data["parent_id"]) - $("#parent_type").val(data["parent_type"]) - $("#teams").val(data["task"]["teams"]) + $("#name").val(data["task"]["name"]); + $("#parent").val(data["task"]["parent"]); + $("#status").val(data["task"]["status"]); + $("#priority").val(data["task"]["priority"]); + $("#start_date").val(data["task"]["start_date"]); + $("#close_date").val(data["task"]["close_date"]); + $("#description").val(data["task"]["description"]); + $("#parent_name").val(data["parent_name"]); + $("#parent_id").val(data["parent_id"]); + $("#parent_type").val(data["parent_type"]); + $("#teams").val(data["task"]["teams"]); ///////////////////ASSGNED USERS//////////////////////////////////////////// - $("#selected-assignee-users").html("") - $("#assigned_user_error").before("
") + $("#selected-assignee-users").html(""); + $("#assigned_user_error").before("
"); for (a in data["assigned_users"]) { if ($.isNumeric(a)) { - strr = "" + strr = ""; // $("#user_name").after(str) - str = "
" + strr + "
" - $("#selected-assignee-users").append(str) + str = "
" + strr + "
"; + $("#selected-assignee-users").append(str); } } ///////////////////END ASSGNED USERS//////////////////////////////////////////// } else if (data["failed"] == "ERROR") { - alert(data["failed"]) + alert(data["failed"]); //login REDIRECT URL } else if (data["AUTH"] == "NO") { - alert("Not Authanticated") + alert("Not Authanticated"); //login redirect } } @@ -173,7 +173,7 @@ $("body").on("click", ".viewthis", function (e) { } else { - console.log(status) + console.log(status); } }); $("#task-create-model").modal("show"); @@ -183,32 +183,32 @@ $("body").on("click", ".viewthis", function (e) { }); $("body").on("click", "#edittask", function (e) { e.preventDefault(); - $(".modal-body :input").removeAttr("disabled") + $(".modal-body :input").removeAttr("disabled"); $("#model-form").attr({"id": "update-form", "type": "submit"}); $("#edittask").attr({"id": "update", "type": "submit"}).text("Update"); $("#modeldialogclosed").attr({"id": "modeldialogclosed"}); - $("#modelbody").append("") + $("#modelbody").append(""); }); $("body").on("click", "#updatemodeldialogclosed", function (e) { e.preventDefault(); - $("i[id$=_error]").text("") + $("i[id$=_error]").text(""); $("#task-create-model").modal("hide"); $("#update").attr({"id": "gocreatetask", "type": "submit"}).text("Create"); - $("#update-form").attr({"id": "model-form"}) + $("#update-form").attr({"id": "model-form"}); $("#model-form").find("input[type=text], textarea").val(""); - $("#parent_name").val("") - $("#parent_id").val("") - $("#updatemodeldialogclosed").attr({"id": "modeldialogclosed"}) + $("#parent_name").val(""); + $("#parent_id").val(""); + $("#updatemodeldialogclosed").attr({"id": "modeldialogclosed"}); }); $("body").on("click", "#createtask", function (e) { - $(".modal-body :input").removeAttr("disabled") + $(".modal-body :input").removeAttr("disabled"); $("#gocreatetask").attr("id", "gocreatetask").text("Create"); $("#edittask").attr("id", "gocreatetask").text("Create"); $("#model-form").find("input[type=text], textarea").val(""); - $("#parent_name").val("") - $("#parent_id").val("") - $("#selected-assignee-users").html("") + $("#parent_name").val(""); + $("#parent_id").val(""); + $("#selected-assignee-users").html(""); }); $("body").on("submit", "#update-form", function (e) { e.preventDefault(); @@ -222,16 +222,16 @@ $("body").on("submit", "#update-form", function (e) { $("#task" + data["id"] + "status").text(data["status"]); $("#task" + data["id"] + "priority").text(data["priority"]); $("#task" + data["id"] + "start_date").text(data["startdate"]); - $("i[id$=_error]").text("") + $("i[id$=_error]").text(""); $("#task-create-model").modal("hide"); $("#update").attr({"id": "gocreatetask", "type": "submit"}).text("Create"); - $("#update-form").attr({"id": "model-form"}) + $("#update-form").attr({"id": "model-form"}); $("#model-form").find("input[type=text], textarea").val(""); - $("#updatemodeldialogclosed").attr({"id": "modeldialogclosed"}) + $("#updatemodeldialogclosed").attr({"id": "modeldialogclosed"}); } else if (data["auth"] == "NO") { - alert("Not Authanticated!!") + alert("Not Authanticated!!"); //login REDIRECT URL } @@ -250,17 +250,17 @@ $("body").on("submit", "#update-form", function (e) { if (data["error"] == "Something Went Wrong!!!") { window.location = "/"; - console.log("Something Went Wrong!!!") + console.log("Something Went Wrong!!!"); } } else { - console.log(status) + console.log(status); } }); }); $("body").on("click", ".editthis", function (e) { - $(".viewthis").click() - $("#edittask").click() + $(".viewthis").click(); + $("#edittask").click(); }); $.ajaxSetup({