diff --git a/common/views.py b/common/views.py index 1345381d..a2529cab 100644 --- a/common/views.py +++ b/common/views.py @@ -56,10 +56,24 @@ def logout_crm(request): @csrf_exempt def users_list(request): users_list = User.objects.all() + page = request.POST.get('per_page') + first_name = request.POST.get('first_name') + last_name = request.POST.get('last_name') + username = request.POST.get('username') + email = request.POST.get('email') active_users = User.objects.filter(is_active=True) inactive_users = User.objects.filter(is_active=False) + if first_name: + users_list = User.objects.filter(first_name__icontains=first_name) + if last_name: + users_list = User.objects.filter(last_name__icontains=last_name) + if username: + users_list = User.objects.filter(username__icontains=username) + if email: + users_list = User.objects.filter(email__icontains=email) return render(request, "users/list.html", { - 'users': users_list, 'active_users': active_users, 'inactive_users': inactive_users + 'users': users_list, 'active_users': active_users, + 'per_page': page, 'inactive_users': inactive_users }) diff --git a/templates/accounts/create_account.html b/templates/accounts/create_account.html index d90fa5a9..d7891222 100644 --- a/templates/accounts/create_account.html +++ b/templates/accounts/create_account.html @@ -11,7 +11,7 @@ {% endblock %} {% block content %}
{% csrf_token %} -
+ +
-->
-
- Overview +
+ CREATE ACCOUNT
@@ -96,6 +95,14 @@
+
+
+ + {{ account_form.assigned_to }} + {{ account_form.assigned_to.errors }} +
+
+
diff --git a/templates/accounts/view_account.html b/templates/accounts/view_account.html index ed335f29..e0c32187 100644 --- a/templates/accounts/view_account.html +++ b/templates/accounts/view_account.html @@ -232,7 +232,7 @@
-
+
diff --git a/templates/cases/create_cases.html b/templates/cases/create_cases.html index 448e5be2..819fca6a 100644 --- a/templates/cases/create_cases.html +++ b/templates/cases/create_cases.html @@ -11,7 +11,7 @@ {% endblock %} {% block content %} {% csrf_token %} -
+
-
- Overview +
+ CREATE CASE
@@ -91,6 +91,12 @@
+
+
+ + {{ case_form.assigned_to }} +
+
diff --git a/templates/cases/view_case.html b/templates/cases/view_case.html index 9173a920..0b445463 100644 --- a/templates/cases/view_case.html +++ b/templates/cases/view_case.html @@ -184,7 +184,7 @@
-
+
@@ -217,348 +217,11 @@
- -
- -
-
- - Activities - -
-
- - - - -
-
-
-
-
    - {% ifequal case.get_meetings|length 0 %} -
  • No Meetings
    • - {% else %} - {% for meet in case.get_meetings %} -
  • -
    -
    - - -
    -
    -
    - - - - - {{meet.name}} - -
    -
    - {{meet.start_date}} -
    -
    • - {% endfor %} - {% endifequal %} -
-
- -
-
    - {% ifequal case.get_tasks|length 0 %} -
  • No Tasks
    • - {% else %} - {% for meet in case.get_tasks %} -
  • -
    -
    - - -
    -
    -
    - - - - - {{meet.name}} - -
    -
    - {{meet.start_date}} -
    -
    • - {% endfor %} - {% endifequal %} -
-
- - -
-
    - {% ifequal case.get_calls|length 0 %} -
  • No Calls
    • - {% else %} - {% for call in case.get_calls %} -
  • -
    -
    - - -
    -
    -
    - - - - - {{call.name}} - -
    -
    - - {{call.start_date}} -
    -
    • - {% endfor %} - {% endifequal %} -
-
-
- -
- -
-
-
-
-
-
- - -
- -
-
- - History - -
-
- - - - - -
-
-
-
-
    - {% ifequal case.get_completed_meetings|length 0 %} -
  • No Data
    • - {% else %} - {% for meet in case.get_completed_meetings %} -
  • -
    -
    - - -
    -
    -
    - - - - - {{meet.name}} | {{ meet.status }} - -
    -
    - {{meet.start_date}} -
    -
    • - {% endfor %} - {% endifequal %} -
-
- -
-
    - {% ifequal case.get_completed_tasks|length 0 %} -
  • No Tasks
    • - {% else %} - {% for meet in case.get_completed_tasks %} -
  • -
    -
    - - -
    -
    -
    - - - - - {{meet.name}} | {{meet.status }} - -
    -
    - {{meet.start_date}} -
    -
    • - {% endfor %} - {% endifequal %} -
-
- - -
-
    - {% ifequal case.get_completed_calls|length 0 %} -
  • No Calls
    • - {% else %} - {% for call in case.get_completed_calls %} -
  • -
    -
    - - -
    -
    -
    - - - - - {{ call.name }} | {{ call.status }} - -
    -
    - - {{ call.start_date }} -
    -
    • - {% endfor %} - {% endifequal %} -
-
-
- -
- -
-
-
-
-
-
- + + END CREATE MEETING MODEL--> {% endblock %} {% block js_block %} diff --git a/templates/contacts/create_contact.html b/templates/contacts/create_contact.html index 688eca8d..ab1e7716 100644 --- a/templates/contacts/create_contact.html +++ b/templates/contacts/create_contact.html @@ -11,7 +11,7 @@ {% endblock %} {% block content %} {%csrf_token%} -
+
-
- Overview +
+ CREATE CONTACT
@@ -86,6 +86,13 @@ {{ contact_form.email.errors }}
+
+
+ + {{ contact_form.assigned_to }} + {{ contact_form.assigned_to.errors }} +
+
diff --git a/templates/contacts/view_contact.html b/templates/contacts/view_contact.html index 3c3419ca..044d62be 100644 --- a/templates/contacts/view_contact.html +++ b/templates/contacts/view_contact.html @@ -187,7 +187,7 @@
-
+
diff --git a/templates/leads/create_lead.html b/templates/leads/create_lead.html index f0bd0f1b..4cf16a82 100644 --- a/templates/leads/create_lead.html +++ b/templates/leads/create_lead.html @@ -11,10 +11,9 @@ {% endblock %} {%block content%} {%csrf_token%} -
+
-
- Overview +
+ CREATE LEAD
@@ -103,6 +102,14 @@
+
+
+ + {{ lead_form.assigned_to }} + {{ lead_form.assigned_to.errors }} +
+
+
diff --git a/templates/leads/leads.html b/templates/leads/leads.html index 9e5469b8..f30f2034 100644 --- a/templates/leads/leads.html +++ b/templates/leads/leads.html @@ -72,61 +72,62 @@
-
- List of Leads - {% if show_pageitems %} {% show_pageitems %}{% else %}Total Leads {{ lead_obj|length }}{% endif %} -
-
- - - - - - - - - - +
+ List of Leads + {% if show_pageitems %} {% show_pageitems %}{% else %}Total Leads {{ lead_obj|length }}{% endif %} +
+
+
S.noNameStatusAssigned UserCreated OnActions
+ + + + + + + + + - - - {% if per_page %} - {% paginate per_page lead_obj %} - {% else %} - {% paginate 10 lead_obj %} - {% endif %} - {% for lead in lead_obj %} - - - - - - - - - {% endfor %} - -
S.noNameStatusAssigned UserCreated OnActions
{{ forloop.counter }}{{ lead.first_name }} {{ lead.last_name }}{{ lead.status }} - {% with lead_users=lead.assigned_to.all %} - {% if lead_users %} - {% for user in lead_users %} -
  • {{ user.user.email }}
    • - {% endfor %} - {% else %} - Not Assigned to Any - {% endif %} - {% endwith %} -     		{{ lead.created_on }} - View - Edit - -
    -
    - {%ifequal lead_obj|length 0%} -
    No Lead Records Found
    - {%endifequal%} -
    - {% show_pages %} + + + {% if per_page %} + {% paginate per_page lead_obj %} + {% else %} + {% paginate 10 lead_obj %} + {% endif %} + {% for lead in lead_obj %} + + {{ forloop.counter }} + {{ lead.first_name }} {{ lead.last_name }} + {{ lead.status }} + + {% with lead_users=lead.assigned_to.all %} + {% if lead_users %} + {% for user in lead_users %} +
  • {{ user.email }}
    • + {% endfor %} + {% else %} + Not Assigned to Any + {% endif %} + {% endwith %} + + {{ lead.created_on }} + + View + Edit + + + + {% endfor %} + + +
    + {%ifequal lead_obj|length 0%} +
    No Lead Records Found
    + {%endifequal%} +
    + {% show_pages %} +
    diff --git a/templates/leads/view_leads.html b/templates/leads/view_leads.html index b329f189..e9c5351e 100644 --- a/templates/leads/view_leads.html +++ b/templates/leads/view_leads.html @@ -223,7 +223,7 @@
    -
    +
    diff --git a/templates/opportunity/create_opportunity.html b/templates/opportunity/create_opportunity.html index 4b837647..d41dcac3 100644 --- a/templates/opportunity/create_opportunity.html +++ b/templates/opportunity/create_opportunity.html @@ -11,7 +11,7 @@ {% endblock %} {% block content %} {% csrf_token %} -
    +
    -
    - Overview +
    + CREATE OPPORTUNITY
    @@ -99,6 +99,13 @@
    +
    +
    + + {{ opportunity_form.assigned_to }} +
    +
    +
    diff --git a/templates/opportunity/view_opportunity.html b/templates/opportunity/view_opportunity.html index 76c7dcd2..cd27d029 100644 --- a/templates/opportunity/view_opportunity.html +++ b/templates/opportunity/view_opportunity.html @@ -202,7 +202,7 @@
    -
    +
    diff --git a/templates/users/create.html b/templates/users/create.html index 000e9cab..94ca5199 100644 --- a/templates/users/create.html +++ b/templates/users/create.html @@ -15,8 +15,8 @@
    -
    - Create User +
    + CREATE USER
    diff --git a/templates/users/list.html b/templates/users/list.html index f1db7366..2ac55d13 100644 --- a/templates/users/list.html +++ b/templates/users/list.html @@ -64,39 +64,56 @@
    -
    - List of Users - {% if show_pageitems %} {% show_pageitems %}{% else %}Total Users {{ user_obj|length }}{% endif %} -
    +
    + List of Users + {% if show_pageitems %} {% show_pageitems %}{% else %}Total Users {{ users|length }}{% endif %} +
    - - - - - - - - - - - - - {% for user in users %} - - - - - - - - {% endfor %} - -
    S.NoFirst NameUsernameEmail AddressStatusActions
    {{ forloop.counter }}{{ user.first_name }}{{ user.username }} - {{ user.email }}{{ user.status }} - View - Edit - Delete -
    + + + + + + + + + + + + + {% if per_page %} + {% paginate per_page users %} + {% else %} + {% paginate 10 users %} + {% endif %} + {% for user in users %} + + + + + + + + + {% endfor %} + +
    S.NoFirst NameUsernameEmail AddressStatusActions
    {{ forloop.counter }}{{ user.first_name }}{{ user.username }}{{ user.email }} + {% if user.is_active == True %} + Active + {% else %} + InActive + {% endif %} + + + Edit + Delete +
    +
    + {% ifequal users|length 0 %} +
    No User Records Found
    + {% endifequal %} +
    + {% show_pages %}
    @@ -107,6 +124,14 @@ {% endblock %} {% block js_block %}