fixed teams

Author: ashwin31

Diff for: 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 for: templates/accounts/create_account.html

@@ -11,7 +11,7 @@
 {% endblock %}
 {% block content %}
   <form id="formid" action='' method="POST" novalidate>{% csrf_token %}
-    <div class="assigned_teams ro marl">
+    <!-- <div class="assigned_teams ro marl">
       <div class="col-md-12">
         <div class="card">
           <div class="card-body">
@@ -39,16 +39,15 @@
         </div>
       </div>
       <br clear="all">
-    </div>
-    <!-- assigned users & teams ends here -->
+    </div> -->
     <!-- overview starts here -->
     <div class="overview_form_block row marl ">
       <div class="col-md-12">
         <div class="card">
 
           <div class="card-body">
-          <div class="card-title">
-            Overview
+          <div class="card-title text-center">
+            CREATE ACCOUNT
           </div>
             <div class="row marl">
               <div class="col-md-6">
@@ -96,6 +95,14 @@
                 </div>
               </div>
               <div class="col-md-6">
+                <div class="filter_col col-12">
+                  <div class="form-group">
+                    <label for="exampleInputEmail1">Assigned Users</label>
+                    {{ account_form.assigned_to }}
+                    {{ account_form.assigned_to.errors }}
+                  </div>
+                </div>
+                <br>
                 <div class="filter_col billing_block col-md-12">
                   <div class="form-group">
                     <label for="exampleInputEmail1">Billing Address</label>

Diff for: templates/accounts/view_account.html

@@ -232,7 +232,7 @@ <h5>Label</h5>
                   </div>
                 </div>
               </div>
-              <div class="filter_col col-md-12">
+              <!-- <div class="filter_col col-md-12">
                 <div class="form-group">
                   <label class="acc_field_label" for="id_team" data-name="name">Assigned Team(s)</label>
                   <div class="account_field" id="account_team" data-name="name">
@@ -245,7 +245,7 @@ <h5>Label</h5>
                     {% endif %}
                   </div>
                 </div>
-              </div>
+              </div> -->
               <div class="filter_col col-md-12">
                 <div class="form-group">
                   <label class="acc_field_label" for="id_created_on" data-name="name">Created On</label>

Diff for: templates/cases/create_cases.html

@@ -11,7 +11,7 @@
 {% endblock %}
 {% block content %}
   <form id="submitForm" method="POST" action="" novalidate>{% csrf_token %}
-    <div class="assigned_teams row marl">
+    <!-- <div class="assigned_teams row marl">
       <div class="col-md-12">
         <div class="card">
          
@@ -38,14 +38,14 @@
         </div>
       </div>
       <br clear="all">
-    </div>
+    </div> -->
     <div class="overview_form_block row marl">
       <div class="col-md-12">
         <div class="card">
 
           <div class="card-body">
-             <div class="card-title" style="height:auto;">
-            Overview
+             <div class="card-title text-center">
+            CREATE CASE
           </div>
             <div class="row marl no-gutters">
               <div class="col-md-6">
@@ -91,6 +91,12 @@
                 </div>
               </div>
               <div class="col-md-6">
+                <div class="filter_col col-md-12">
+                  <div class="form-group">
+                    <label for="exampleInputEmail1">Assigned Users</label>
+                    {{ case_form.assigned_to }}
+                  </div>
+                </div>
                 <div class="filter_col col-md-12">
                   <div class="form-group">
                     <label for="id_account">Account{% if case_form.account.field.required %}<span class="error">*</span>{% endif %}</label>