Merge pull request #253 from MicroPyramid/dev

added modals to list pages
This commit is contained in:
Ashwin Kumar 2019-07-05 13:26:21 +05:30 committed by GitHub
commit b41b0fe7a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 2046 additions and 100 deletions

View file

@ -115,8 +115,12 @@
{% for each_account in open_accounts %}
<tr id="account_details{{each_account.id}}" class="text-center">
<td scope="row" class="s_no" data-id="{{forloop.counter}}">{{ forloop.counter }}</td>
<td>{% if each_account.name %}<a
<!-- <td>{% if each_account.name %}<a
href="{% url 'accounts:view_account' each_account.id %}">{{ each_account.name }}</a>{% endif %}
</td> -->
<td>{% if each_account.name %}<a data-toggle="modal"
data-target="#exampleModalCenter_account{{each_account.id}}"
href="#">{{ each_account.name }}</a>{% endif %}
</td>
<td>
{% if each_account.created_by %}
@ -149,7 +153,8 @@
{% endwith %}
</td>
<td class="actions">
{# <a href="{% url 'accounts:view_account' each_account.id %}" class="btn btn-info view"><i class="fas fa-eye"></i> View</a> #}
<a href="{% url 'accounts:view_account' each_account.id %}" class="btn btn-info edit"><i
class="fas fa-eye"></i></a>
<a href="{% url 'accounts:edit_account' each_account.id %}" class="btn btn-success edit"><i
class="fas fa-pencil-alt"></i></a>
<a href="{% url 'accounts:remove_account' each_account.id %}"
@ -203,8 +208,8 @@
{% for each_account in close_accounts %}
<tr id="account_details{{each_account.id}}">
<td scope="row">{{ forloop.counter }}</td>
<td>{% if each_account.name %}<a
href="{% url 'accounts:view_account' each_account.id %}">{{ each_account.name }}</a>{% endif %}
<td>{% if each_account.name %}<a href="#" data-toggle="modal"
data-target="#exampleModalCenter_account{{each_account.id}}">{{ each_account.name }}</a>{% endif %}
</td>
<td>
{% if each_account.created_by %}
@ -237,6 +242,8 @@
{% endwith %}
</td>
<td class="actions">
<a href="{% url 'accounts:view_account' each_account.id %}" class="btn btn-info edit"><i
class="fas fa-eye"></i></a>
<a href="{% url 'accounts:edit_account' each_account.id %}" class="btn btn-success edit"><i
class="fas fa-pencil-alt"></i></a>
<a href="{% url 'accounts:remove_account' each_account.id %}"
@ -267,6 +274,369 @@
<!-- accounts list end -->
</div>
<!-- main_container ends here -->
{% for account_record in open_accounts %}
<div class="modal fade" id="exampleModalCenter_account{{account_record.id}}" tabindex="-1" role="dialog"
aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">{{account_record.name}}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div id="modal_body_ajax">
</div>
<!-- <textarea name="modal_data" id="modal_data" cols="30" rows="10"></textarea> -->
<!-- ... -->
<div class="" id="">
<div class="">
<div class="col-md-12" id="">
<div class="card">
<div class="card-body" id="datashow">
<div class="card-title text-right">
<h5>
<!-- <span class="float-left title">Overview</span> -->
<span style="margin-top: 0px">
<!-- <div class="dropdown buttons_row">
<button class="btn primary_btn dropdown-toggle" type="button" data-toggle="dropdown">Actions
<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="#">Edit</a></li>
</ul>
</div> -->
</span>
</h5>
</div>
<div class="row marl">
<div class="col-md-4">
{% if account_record.name %}
<div class="filter_col col-md-12" id="iname">
<div class="form-group">
<label class="acc_field_label" for="id_name" data-name="name">Name</label>
<div class="account_field" id="account_name" data-name="name">{{ account_record.name }}</div>
</div>
</div>
{% endif %}
{% if account_record.phone %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_phone" data-name="name">Phone</label>
<div class="account_field" id="account_phone" data-name="name">{{ account_record.phone }}
</div>
</div>
</div>
{% endif %}
{% if account_record.status %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_status" data-name="name">Status</label>
<div class="account_field" id="account_status" data-name="name">{{ account_record.status }}
</div>
</div>
</div>
{% endif %}
</div>
<div class="col-md-4">
{% if account_record.email %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_email" data-name="name">Email</label>
<div class="account_field" id="account_email" data-name="name">{{ account_record.email }}
</div>
</div>
</div>
{% endif %}
{% if account_record.website %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Website</label>
<div class="account_field" id="account_website" data-name="name">{{ account_record.website }}
</div>
</div>
</div>
{% endif %}
{% if account_record.contacts.all %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Contacts</label>
{% for contact in account_record.contacts.all %}
<div class="account_field" id="account_website" data-name="name">{{ contact }}</div>
{% endfor %}
</div>
</div>
{% endif %}
{% if account_record.lead %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">lead</label>
<div class="account_field" id="account_website" data-name="name">{{ account_record.lead }}
</div>
</div>
</div>
{% endif %}
</div>
<div class="col-md-4">
{% if account_record.billing_address_line or account_record.billing_street or account_record.billing_city or account_record.billing_state or account_record.billing_postcode or account_record.billing_country %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_billing_address" data-name="name">Billing
Address</label>
<div class="account_field" id="account_billing_address" data-name="name">
{{account_record.get_complete_address}}
</div>
</div>
</div>
{% endif %}
<div class="filter_col col-md-12">
{% if account_record.assigned_to.all %}
<div class="form-group">
<label class="case_field_label" for="id_contact" data-name="name">Assigned To</label>
<div class="case_field" id="case_contact" data-name="name">
{% for user in account_record.assigned_to.all %}
<div>
<a href="{% url 'common:view_user' user.id %}">{{user}}</a>
</div>
{% endfor %}
</div>
</div>
{% endif %}
</div>
{% if account_record.description %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_description" data-name="name">Description</label>
<div class="account_field" id="account_description" data-name="name">
{{ account_record.description }}
</div>
</div>
</div>
{% endif %}
{% if account_record.tags.all %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_tags" data-name="name">Tags</label>
<div class="account_field" id="account_tags" data-name="name">
{% for tag in account_record.tags.all %}
<span class="text-left" id="list_tag">{{ tag.name }}</span>
{% endfor %}
</div>
</div>
</div>
{% endif %}
</div>
<div class="col-md-12">
<div class="created_information">
Created by <b>{{ account_record.created_by }}</b> created on
<b>{{ account_record.created_on }}</b>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div> -->
</div>
</div>
{% endfor %}
{% for account_record in close_accounts %}
<div class="modal fade" id="exampleModalCenter_account{{account_record.id}}" tabindex="-1" role="dialog"
aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">{{account_record.name}}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div id="modal_body_ajax">
</div>
<!-- <textarea name="modal_data" id="modal_data" cols="30" rows="10"></textarea> -->
<!-- ... -->
<div class="" id="">
<div class="">
<div class="col-md-12" id="">
<div class="card">
<div class="card-body" id="datashow">
<div class="card-title text-right">
<h5>
<!-- <span class="float-left title">Overview</span> -->
<span style="margin-top: 0px">
<!-- <div class="dropdown buttons_row">
<button class="btn primary_btn dropdown-toggle" type="button" data-toggle="dropdown">Actions
<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="#">Edit</a></li>
</ul>
</div> -->
</span>
</h5>
</div>
<div class="row marl">
<div class="col-md-4">
{% if account_record.name %}
<div class="filter_col col-md-12" id="iname">
<div class="form-group">
<label class="acc_field_label" for="id_name" data-name="name">Name</label>
<div class="account_field" id="account_name" data-name="name">{{ account_record.name }}</div>
</div>
</div>
{% endif %}
{% if account_record.phone %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_phone" data-name="name">Phone</label>
<div class="account_field" id="account_phone" data-name="name">{{ account_record.phone }}
</div>
</div>
</div>
{% endif %}
{% if account_record.status %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_status" data-name="name">Status</label>
<div class="account_field" id="account_status" data-name="name">{{ account_record.status }}
</div>
</div>
</div>
{% endif %}
</div>
<div class="col-md-4">
{% if account_record.email %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_email" data-name="name">Email</label>
<div class="account_field" id="account_email" data-name="name">{{ account_record.email }}
</div>
</div>
</div>
{% endif %}
{% if account_record.website %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Website</label>
<div class="account_field" id="account_website" data-name="name">{{ account_record.website }}
</div>
</div>
</div>
{% endif %}
{% if account_record.contacts.all %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Contacts</label>
{% for contact in account_record.contacts.all %}
<div class="account_field" id="account_website" data-name="name">{{ contact }}</div>
{% endfor %}
</div>
</div>
{% endif %}
{% if account_record.lead %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">lead</label>
<div class="account_field" id="account_website" data-name="name">{{ account_record.lead }}
</div>
</div>
</div>
{% endif %}
</div>
<div class="col-md-4">
{% if account_record.billing_address_line or account_record.billing_street or account_record.billing_city or account_record.billing_state or account_record.billing_postcode or account_record.billing_country %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_billing_address" data-name="name">Billing
Address</label>
<div class="account_field" id="account_billing_address" data-name="name">
{{account_record.get_complete_address}}
</div>
</div>
</div>
{% endif %}
<div class="filter_col col-md-12">
{% if account_record.assigned_to.all %}
<div class="form-group">
<label class="case_field_label" for="id_contact" data-name="name">Assigned To</label>
<div class="case_field" id="case_contact" data-name="name">
{% for user in account_record.assigned_to.all %}
<div>
<a href="{% url 'common:view_user' user.id %}">{{user}}</a>
</div>
{% endfor %}
</div>
</div>
{% endif %}
</div>
{% if account_record.description %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_description" data-name="name">Description</label>
<div class="account_field" id="account_description" data-name="name">
{{ account_record.description }}
</div>
</div>
</div>
{% endif %}
{% if account_record.tags.all %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_tags" data-name="name">Tags</label>
<div class="account_field" id="account_tags" data-name="name">
{% for tag in account_record.tags.all %}
<span class="text-left" id="list_tag">{{ tag.name }}</span>
{% endfor %}
</div>
</div>
</div>
{% endif %}
</div>
<div class="col-md-12">
<div class="created_information">
Created by <b>{{ account_record.created_by }}</b> created on
<b>{{ account_record.created_on }}</b>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div> -->
</div>
</div>
{% endfor %}
{% endblock %}
{% block js_block %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>
@ -275,6 +645,37 @@
$("#tab_status").val('Closed');
})
// $(".account_modal").click(function (e) {
// console.log('clicked')
// console.log(e)
// console.log($(this).attr('data-id'))
// $.ajax({
// url:`get-account-details/${$(this).attr('data-id')}/`,
// type: 'GET',
// success:function(data){
// console.log(data)
// console.log((data.data.fields))
// $('#modal_body_ajax').empty()
// for(key in data.data.fields){
// console.log(key, data.data.fields[key])
// $('#modal_body_ajax').append(
// "<div class=''><span>" + key + "</span>&nbsp;&nbsp;&nbsp;&nbsp;" + "<span>" + data.data.fields[key] + "</span>" + "</div>"
// )
// }
// // $('textarea#modal_data').val(JSON.stringify(data))
// $('#exampleModalCenter_account').modal()
// if(data.error){
// // TODO
// data.fields
// }
// else{
// }
// }
// })
// })
$("#open-tab").click(function (e) {
$("#tab_status").val('Open')
})

View file

@ -2,7 +2,7 @@ from django.urls import path
from accounts.views import (
AccountsListView, CreateAccountView, AccountDetailView, AccountUpdateView,
AccountDeleteView, AddCommentView, UpdateCommentView, DeleteCommentView,
AddAttachmentView, DeleteAttachmentsView, create_mail
AddAttachmentView, DeleteAttachmentsView, create_mail, #get_account_details
)
app_name = 'accounts'
@ -25,4 +25,6 @@ urlpatterns = [
name="remove_attachment"),
path('create-mail/<int:account_id>/', create_mail,
name="create_mail"),
# path('get-account-details/<int:account_id>/', get_account_details, name="get_account_details"),
]

View file

@ -542,3 +542,14 @@ def create_mail(request, account_id):
return JsonResponse({'error': False})
else:
return JsonResponse({'error': True, 'errors': form.errors})
# @login_required
# def get_account_details(request, account_id):
# from django.core import serializers
# import json
# fields = ['name', 'email', 'phone', 'industry', 'billing_address_line', 'billing_street', 'billing_city',
# 'billing_state', 'billing_postcode', 'billing_country', 'website', 'description',
# 'created_by__email', 'created_on', 'tags__name', 'status', 'contacts__email', 'assigned_to__email']
# data = serializers.serialize('json', Account.objects.filter(id=account_id), fields=fields)
# return JsonResponse({'data': json.loads(data)[0]})

View file

@ -7,30 +7,34 @@
<!-- heading_create starts here -->
<div class="row marl">
<div class="col-lg-12 text-right">
<span class="d-inline"><a class="primary_btn" href="{% url 'cases:add_case' %}"><i class="fa fa-plus"></i> Add New Case</a></span>
<span class="d-inline"><a class="primary_btn" href="{% url 'cases:add_case' %}"><i class="fa fa-plus"></i> Add New
Case</a></span>
</div>
</div>
<div class="filter_row list_filter_row row marl">
<div class="col-md-12">
<div class="card">
<div class="card-body">
<form id="cases_filter" method="POST" action="" >
<form id="cases_filter" method="POST" action="">
<div class="card-body">
<div class="card-title">Filters</div>
<div class="row marl">
<div class="filter_col col-md-2">
<div class="form-group">
<label for="exampleInputEmail1">Name</label>
<input type="text" class="form-control" placeholder="Name" name="name" value="{{request.POST.name}}">
<input type="text" class="form-control" placeholder="Name" name="name"
value="{{request.POST.name}}">
</div>
</div>
<div class="filter_col col-md-2">
<div class="form-group">
<label for="exampleInputEmail1">Status</label>
<select class="form-control" id="id_status" name="status" >
<select class="form-control" id="id_status" name="status">
<option value="">--Status--</option>
{% for each_status in case_status %}
<option value="{{each_status.0}}" {% if request.POST.status %} {% ifequal each_status.0 request.POST.status %}selected{% endifequal %}{% endif %} >{{each_status.1}} </option>
<option value="{{each_status.0}}" {% if request.POST.status %}
{% ifequal each_status.0 request.POST.status %}selected{% endifequal %}{% endif %}>
{{each_status.1}} </option>
{% endfor%}
</select>
</div>
@ -38,10 +42,12 @@
<div class="filter_col col-md-2">
<div class="form-group">
<label for="exampleInputEmail1">Priority</label>
<select class="form-control" id="id_priority" name="priority" >
<select class="form-control" id="id_priority" name="priority">
<option value="">--Priority--</option>
{% for each_priority in case_priority %}
<option value="{{each_priority.0}}" {% if request.POST.priority %} {% ifequal each_priority.0 request.POST.priority %}selected{% endifequal %}{% endif %}>{{each_priority.1}} </option>
<option value="{{each_priority.0}}" {% if request.POST.priority %}
{% ifequal each_priority.0 request.POST.priority %}selected{% endifequal %}{% endif %}>
{{each_priority.1}} </option>
{% endfor%}
</select>
</div>
@ -52,7 +58,7 @@
<select class="form-control" id="id_account" name="account">
<option value="">--Select Account--</option>
{% for ac in accounts %}
<option value="{{ac.id}}" {% ifequal acc ac.id %} selected {% endifequal %} >{{ac.name}}</option>
<option value="{{ac.id}}" {% ifequal acc ac.id %} selected {% endifequal %}>{{ac.name}}</option>
{% endfor %}
</select>
</select>
@ -79,9 +85,10 @@
<div class="card">
<div class="card-body">
<div class="panel-heading-list card-title text-right">
<span class="total_count float-left">Cases - {% if show_pageitems %} {% show_pageitems %}{% else %}{{ cases|length }}{% endif %}</span>
<span class="total_count float-left">Cases - {% if show_pageitems %}
{% show_pageitems %}{% else %}{{ cases|length }}{% endif %}</span>
<span class="filter_toggle ">
<a href="#" class="primary_btn"><i class="fas fa-filter"></i></a>
<a href="#" class="primary_btn"><i class="fas fa-filter"></i></a>
</span>
</div>
<div class="table-responsive">
@ -107,7 +114,7 @@
{% for case in cases %}
<tr class="case_row{{case.id}}" style="text-align:center;">
<td scope="row">{{ forloop.counter }}</td>
<td><a href="{% url 'cases:view_case' case.id %}">{{ case.name }}</a></td>
<td><a href="#" data-toggle="modal" data-target="#exampleModalCenter_case{{case.id}}">{{ case.name }}</a></td>
<td>
{% if case.account %}
<a href="{% url 'accounts:view_account' case.account.id %}">{{ case.account }}</a>
@ -118,12 +125,15 @@
<td id="status_id{{case.id}}" status="{{case.status}}">{{ case.status }}</td>
<td>{{ case.priority }}</td>
<td class="actions">
{# <a href="{% url 'cases:view_case' case.id %}" class="btn btn-info view"><i class="fas fa-eye"></i> View</a> #}
<a href="{% url 'cases:edit_case' case.id %}" class="btn btn-success edit"><i class="fas fa-pencil-alt"></i></a>
<a href="{% url 'cases:view_case' case.id %}" class="btn btn-info view"><i class="fas fa-eye"></i></a>
<a href="{% url 'cases:edit_case' case.id %}" class="btn btn-success edit"><i
class="fas fa-pencil-alt"></i></a>
{% if request.user == case.created_by or request.user.role == "ADMIN" or request.user.is_superuser %}
<a href="{% url 'cases:remove_case' case.id %}" class="btn btn-danger delete remove_case"><i class="fas fa-trash-alt"></i></a>
<a href="{% url 'cases:remove_case' case.id %}" class="btn btn-danger delete remove_case"><i
class="fas fa-trash-alt"></i></a>
{% if case.status != 'Closed' %}
<a onclick="close_case({{case.id}}, '{% url 'cases:close_case' %}')" class="btn btn-info"><i class="fas fa-times"></i> </a>
<a onclick="close_case({{case.id}}, '{% url 'cases:close_case' %}')" class="btn btn-info"><i
class="fas fa-times"></i> </a>
{% endif %}
{% endif %}
</td>
@ -143,45 +153,176 @@
</div>
</div>
</div>
{% for case_record in cases %}
<div class="modal fade" id="exampleModalCenter_case{{case_record.id}}" tabindex="-1" role="dialog"
aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">{{ case_record.name }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<!-- ... -->
<div class="" id="">
<div class="">
<div class="col-md-12" id="">
<div class="card">
<div class="card-body" id="datashow">
<div class="card-title text-right">
<h5>
<!-- <span class="float-left title">Overview</span> -->
<span class="" style="margin-top: 0px">
<!-- <div class="dropdown buttons_row">
<button class="btn primary_btn dropdown-toggle" type="button" data-toggle="dropdown">Actions
<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="{% url 'cases:edit_case' case_record.id %}">Edit</a></li>
</ul>
</div> -->
</span>
</h5>
</div>
<div class="row marl">
<div class="col-md-4">
<div class="filter_col col-md-12" id="iname">
<div class="form-group">
<label class="case_field_label" for="id_name" data-name="name">Name</label>
<div class="case_field" id="case_name" data-name="name">{{ case_record.name }}</div>
</div>
</div>
<div class="filter_col col-md-12">
{% if case_record.account %}
<div class="form-group">
<label class="case_field_label" for="id_account" data-name="name">Account</label>
<div class="case_field" id="case_account" data-name="name">{{ case_record.account }}</div>
</div>
{% endif %}
</div>
<div class="filter_col col-md-12">
{% if case_record.contacts.all %}
<div class="form-group">
<label class="case_field_label" for="id_contact" data-name="name">Contact</label>
<div class="case_field" id="case_contact" data-name="name">
{% for contact in case_record.contacts.all %}
<div>{{ contact }}</div>
{% endfor %}
</div>
</div>
{% endif %}
</div>
<div class="filter_col col-md-12">
{% if case_record.closed_on %}
<div class="form-group">
<label class="case_field_label" for="id_closedon" data-name="name">Close Date</label>
<div class="case_field" id="case_closedon" data-name="name">{{ case_record.closed_on|date }}
</div>
</div>
{% endif %}
</div>
</div>
<div class="col-md-4">
<div class="filter_col col-md-12">
<div class="form-group">
<label class="case_field_label" for="id_status" data-name="name">Status</label>
<div class="case_field" id="case_status" data-name="name">{{ case_record.status }}</div>
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="case_field_label" for="id_priority" data-name="name">Priority</label>
<div class="case_field" id="case_priority" data-name="name">{{ case_record.priority }}</div>
</div>
</div>
<div class="filter_col col-md-12">
{% if case_record.case_type %}
<div class="form-group">
<label class="case_field_label" for="id_case_type" data-name="name">Type of Case</label>
<div class="case_field" id="case_case_type" data-name="name">{{ case_record.case_type }}</div>
</div>
{% endif %}
</div>
</div>
<div class="col-md-4">
<div class="filter_col col-md-12">
{% if case_record.description %}
<div class="form-group">
<label class="case_field_label" for="id_description" data-name="name">Description</label>
<div class="case_field" id="case_description" data-name="name">{{ case_record.description }}
</div>
</div>
{% endif %}
</div>
</div>
<div class="col-md-12">
<div class="created_information">
Created by <b>{{ case_record.created_by }}</b> created on <b>{{ case_record.created_on }}</b>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div> -->
</div>
</div>
{% endfor %}
<!-- main_container ends here -->
{% endblock %}
{% block js_block %}
<script type="text/javascript">
function close_case(x, url){
var stat = $("#status_id"+x).text()
if(stat==="Closed"){
function close_case(x, url) {
var stat = $("#status_id" + x).text()
if (stat === "Closed") {
alert("Case Already Closed")
}
else{
else {
$.post(url, {
"case_id": x
}, function(data) {
"case_id": x
}, function (data) {
location.reload();
})
}
}
$(document).ready(function(){
$(".filter_toggle").click(function(){
$(".list_filter_row").toggle();
});
$(document).ready(function () {
$(".filter_toggle").click(function () {
$(".list_filter_row").toggle();
});
});
search = "{{search}}"
if (search == 'True'){
if (search == 'True') {
$(".list_filter_row").show();
}
$('.remove_case').click(function(e){
$('.remove_case').click(function (e) {
e.preventDefault()
url = $(this).attr('href')
if (!confirm('Are you sure you want to delete?'))
return;
window.location = $(this).attr('href')
});
$("a[rel='page']").click(function(e){
$("a[rel='page']").click(function (e) {
e.preventDefault();
$('#cases_filter').attr("action", $(this).attr("href"));
$('#cases_filter').submit();

View file

@ -86,9 +86,9 @@
<tr>
<th width="5%">S.No</th>
<th width="15%">Title</th>
<th width="10%">Created By</th>
<th width="5%">Created By</th>
<th width="15%">Created On</th>
<th width="10%">Status</th>
<th width="5%">Status</th>
<th width="20%">Shared To</th>
<th width="10%">Actions</th>
</tr>
@ -103,8 +103,8 @@
{% for document in documents %}
<tr id="account_details{{each_account.id}}" class="text-center">
<td scope="row">{{ forloop.counter }}</td>
<td>{% if document.title %}<a
href="{% url 'common:view_doc' document.id %}">{{ document.title }}</a>{% endif %}</td>
<td>{% if document.title %}<a data-toggle="modal"
href="#" data-target="#exampleModalCenter_doc{{document.id}}">{{ document.title }}</a>{% endif %}</td>
<td>
{% if document.created_by %}
{% if document.created_by.profile_pic %}
@ -142,6 +142,8 @@
</td>
<td class="actions">
{% if request.user == document.created_by or request.user.role == 'ADMIN' %}
<a href="{% url 'common:view_doc' document.id %}" class="btn btn-info edit"><i
class="fas fa-eye"></i></a>
<a href="{% url 'common:edit_doc' document.id %}" class="btn btn-success edit"><i
class="fas fa-pencil-alt"></i></a>
<a href="{% url 'common:remove_doc' document.id %}" class="btn btn-danger delete remove_document"><i
@ -172,6 +174,132 @@
<!-- accounts list end -->
</div>
<!-- main_container ends here -->
{% for doc_obj in documents %}
<div class="modal fade" id="exampleModalCenter_doc{{doc_obj.id}}" tabindex="-1" role="dialog"
aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">{{ doc_obj.title }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<!-- ... -->
<!-- OPPORTUNITY VIEW STARTS -->
<div class="" id="">
<div class="">
<div class="col-md-12">
<div class="card">
<div class="card-body" id="datashow">
<div class="panel-heading card-title view-pad text-center">
<!-- <h5>
Document
</h5> -->
<!-- <a href="{% url 'common:edit_doc' doc_obj.id %}" class="btn btn-success edit">Edit</a> -->
</div>
<div class="row marl no-gutters">
<div class="col-md-8">
{% if doc_obj.title %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="contact_field_label" for="id_title" data-name="title">Title</label>
<div class="contact_field" id="doc_title" data-name="name">{{ doc_obj.title }} </div>
</div>
</div>
{% endif %}
{% if doc_obj.status %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="contact_field_label" for="id_status" data-name="status">Status</label>
<div class="contact_field" id="doc_status" data-name="status">{{ doc_obj.status }} </div>
</div>
</div>
{% endif %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="contact_field_label" for="id_created_by" data-name="created_by">Created
By</label>
<div class="contact_field" id="created_by" data-name="created_by">{{ doc_obj.created_by }}
</div>
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="contact_field_label" for="id_created_on" data-name="created_on">Created
On</label>
<div class="contact_field" id="created_on" data-name="created_on">{{ doc_obj.created_on }}
</div>
</div>
</div>
{% with document_users=document.shared_to.all %}
{% if document_users %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="contact_field_label" for="id_created_on" data-name="created_on">Shared
To</label>
<br>
{% for user in document_users %}
{% if user.profile_pic %}
{% thumbnail user.profile_pic "40x40" crop="center" as im %}
<span>
<a href="{% url 'common:view_user' user.id %}">
<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"
title="{{ user.email }}">
</a>
</span>
{% endthumbnail %}
{% else %}
<span>
<a href="{% url 'common:view_user' user.id %}">
<img src="{% static 'images/user.png' %}" title="{{ user.email }}" width="40" height="40">
</a>
</span>
{% endif %}
{% empty %}
None
{% endfor %}
</div>
</div>
{% endif %}
{% endwith %}
</div>
<div class="col-md-4">
<div class="profile_pic">
{% if doc_obj.document_file %}
<i class="{{file_type_code}}" aria-hidden="true" style="font-size:3rem;"></i>
<!-- <a href="{{doc_obj.document_file.url}}" target="_blank">Download</a> -->
<!-- <a style="display:block;" href="{% url 'common:download_document' doc_obj.id %}">Download</a> -->
</td>
{% endif %}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div> -->
</div>
</div>
{% endfor %}
{% endblock %}
{% block js_block %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>

View file

@ -11,7 +11,8 @@
<!-- heading_create starts here -->
<div class="row marl">
<div class="col-lg-12 text-right">
<span class="d-inline"><a class="primary_btn" href="{% url 'contacts:add_contact'%}"><i class="fa fa-plus"></i> Add New Contact</a></span>
<span class="d-inline"><a class="primary_btn" href="{% url 'contacts:add_contact'%}"><i class="fa fa-plus"></i>
Add New Contact</a></span>
</div>
</div>
<div class="filter_row list_filter_row row marl">
@ -25,28 +26,31 @@
<div class="filter_col col-md-3">
<div class="form-group">
<label for="exampleInputEmail1">NAME</label>
<input type="text" class="form-control" placeholder="First Name" name="first_name" value="{{request.POST.first_name}}">
<input type="text" class="form-control" placeholder="First Name" name="first_name"
value="{{request.POST.first_name}}">
</div>
</div>
<div class="filter_col col-md-3">
<div class="form-group">
<label for="exampleInputEmail1">CITY</label>
<input type="text" class="form-control" placeholder="City" name="city" value="{{request.POST.city}}">
<input type="text" class="form-control" placeholder="City" name="city"
value="{{request.POST.city}}">
</div>
</div>
<div class="filter_col col-md-3">
<div class="form-group">
<label for="exampleInputEmail1">Assigned To</label>
<select class="assigned_users form-control" name="assigned_to" multiple="multiple">
{% for user in users %}
<option value="{{user.id}}" {% if user.id in assignedto_list %} selected="" {% endif %}>{{user.email}}</option>
{% endfor %}
{% for user in users %}
<option value="{{user.id}}" {% if user.id in assignedto_list %} selected="" {% endif %}>
{{user.email}}</option>
{% endfor %}
</select>
</div>
</div>
<div class="filter_col text-center col-3">
<div class="form-group buttons_row">
<button class="btn btn-primary save" type="submit">Search</button>
<button class="btn btn-primary save" type="submit">Search</button>
<a href="{% url 'contacts:list' %}" class="btn btn-default clear">Clear</a>
</div>
</div>
@ -65,11 +69,12 @@
<div class="card-body">
<div class="card-title text-right">
<span class="float-left">Contacts - {% if show_pageitems %} {% show_pageitems %}{% else %} {{contact_obj_list|length}}{% endif %}</span>
<span class="filter_toggle">
<a href="#" class="primary_btn"><i class="fas fa-filter"></i></a>
</span>
<span class="float-left">Contacts - {% if show_pageitems %} {% show_pageitems %}{% else %}
{{contact_obj_list|length}}{% endif %}</span>
<span class="filter_toggle">
<a href="#" class="primary_btn"><i class="fas fa-filter"></i></a>
</span>
</div>
<div class="table-responsive">
@ -77,12 +82,12 @@
<thead>
{% if contact_obj_list|length > 0 %}
<tr>
<th width="5%" >S.no</th>
<th width="20%" >Name</th>
<th width="5%">S.no</th>
<th width="20%">Name</th>
<th width="20%">Assigned To</th>
<th width="15%" >City</th>
<th width="15%" >State</th>
<th width="15%" >Actions</th>
<th width="15%">City</th>
<th width="15%">State</th>
<th width="15%">Actions</th>
</tr>
{% endif %}
</thead>
@ -95,25 +100,26 @@
{% for contact in contact_obj_list %}
<tr style="text-align:center;">
<td scope="row">{{ forloop.counter }}</td>
<td><a href="{% url 'contacts:view_contact' contact.id %}">{{contact.first_name}} {{contact.last_name}}</a></td>
<td><a href="#" data-toggle="modal" data-target="#exampleModalCenter_contact{{contact.id}}">{{contact.first_name}}
{{contact.last_name}}</a></td>
<td>
{% with contact_users=contact.assigned_to.all %}
{% for user in contact_users %}
{% if user.profile_pic %}
{% with contact_users=contact.assigned_to.all %}
{% for user in contact_users %}
{% if user.profile_pic %}
{% thumbnail user.profile_pic "40x40" crop="center" as im %}
<a href="{% url 'common:view_user' user.id %}">
<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" title="{{ user.email }}">
</a>
{% endthumbnail %}
{% else %}
<a href="{% url 'common:view_user' user.id %}">
<img src="{% static 'images/user.png' %}" title="{{ user.email }}" width="40" height="40">
</a>
{% endif %}
{% empty %}
None
{% endfor %}
{% endwith %}
{% else %}
<a href="{% url 'common:view_user' user.id %}">
<img src="{% static 'images/user.png' %}" title="{{ user.email }}" width="40" height="40">
</a>
{% endif %}
{% empty %}
None
{% endfor %}
{% endwith %}
</td>
<td>
{% if contact.address.city %}
@ -130,10 +136,12 @@
{% endif %}
</td>
<td class="actions">
{# <a href="{% url 'contacts:view_contact' contact.id %}" class="btn btn-info view"><i class="fas fa-eye"></i> View</a> #}
<a href="{% url 'contacts:edit_contact' contact.id%}" class="btn btn-success edit"><i class="fas fa-pencil-alt"></i></a>
<a href="{% url 'contacts:view_contact' contact.id %}" class="btn btn-info view"><i class="fas fa-eye"></i></a>
<a href="{% url 'contacts:edit_contact' contact.id%}" class="btn btn-success edit"><i
class="fas fa-pencil-alt"></i></a>
{% if request.user == contact.created_by or request.user.role == "ADMIN" or request.user.is_superuser %}
<a href="{% url 'contacts:remove_contact' contact.id %}" class="btn btn-danger delete remove_account"><i class="fas fa-trash-alt"></i></a>
<a href="{% url 'contacts:remove_contact' contact.id %}"
class="btn btn-danger delete remove_account"><i class="fas fa-trash-alt"></i></a>
{% endif %}
</td>
</tr>
@ -155,30 +163,140 @@
<!-- filter_row ends here -->
</div>
<!-- main_container ends here -->
{% for contact_record in contact_obj_list %}
<div class="modal fade" id="exampleModalCenter_contact{{contact_record.id}}" tabindex="-1" role="dialog"
aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">{{ contact_record.first_name }}
{{ contact_record.last_name }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="" id="">
<div class="">
<div class="col-md-12" id="">
<div class="card">
<div class="card-body" id="datashow">
<div class="card-title text-right">
<h5>
<!-- <span class="float-left title">Overview</span> -->
<span class="" style="margin-top: 0px">
<!-- <div class="dropdown buttons_row">
<button class="btn primary_btn dropdown-toggle" type="button" data-toggle="dropdown">Actions
<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="{% url 'contacts:edit_contact' contact_record.id %}">Edit</a></li>
</ul>
</div> -->
</span>
</h5>
</div>
<div class="row marl">
<div class="col-md-4">
<div class="filter_col col-md-12" id="iname">
<div class="form-group">
<label class="contact_field_label" for="id_name" data-name="name">Name</label>
<div class="contact_field" id="contact_name" data-name="name">{{ contact_record.first_name }}
{{ contact_record.last_name }}</div>
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="contact_field_label" for="id_phone" data-name="name">Phone</label>
<div class="contact_field" id="contact_phone" data-name="name">{{ contact_record.phone }}
</div>
</div>
</div>
</div>
<div class="col-md-4">
<div class="filter_col col-md-12">
<div class="form-group">
<label class="contact_field_label" for="id_email" data-name="name">Email</label>
<div class="contact_field" id="contact_email" data-name="name">{{ contact_record.email }}
</div>
</div>
</div>
</div>
<div class="col-md-4">
<div class="filter_col col-md-12">
<div class="form-group">
{% if contact_record.address.address_line or contact_record.address.street or contact_record.address.city or contact_record.address.state or contact_record.address.postcode or contact_record.address.country %}
<label class="contact_field_label" for="id_address" data-name="name">Billing Address</label>
<div class="contact_field" id="contact_address" data-name="name">
{{contact_record.address.get_complete_address}}
</div>
{% endif %}
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
{% if contact_record.description %}
<label class="contact_field_label" for="id_description" data-name="name">Description</label>
<div class="contact_field" id="contact_description" data-name="name">
{{ contact_record.description }}
</div>
{% endif %}
</div>
</div>
</div>
<div class="col-md-12">
<div class="created_information">
Created by <b>{{ contact_record.created_by }}</b> created on
<b>{{ contact_record.created_on }}</b>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{% endfor %}
{%endblock%}
{% block js_block %}
<script type="text/javascript">
$(document).ready(function(){
$('.assigned_users').select2();
$(".filter_toggle").click(function(){
$(".list_filter_row").toggle();
$(document).ready(function () {
$('.assigned_users').select2();
$(".filter_toggle").click(function () {
$(".list_filter_row").toggle();
});
});
search = "{{search}}"
if (search == 'True'){
if (search == 'True') {
$(".list_filter_row").show();
}
$('.delete').click(function(e){
$('.delete').click(function (e) {
e.preventDefault()
url = $(this).attr('href')
if (!confirm('Are you sure you want to delete?'))
return;
window.location = $(this).attr('href')
});
$("a[rel='page']").click(function(e){
$("a[rel='page']").click(function (e) {
e.preventDefault();
$('#contacts_filter').attr("action", $(this).attr("href"));
$('#contacts_filter').submit();

View file

@ -137,7 +137,7 @@
{% for event in events %}
<tr class="text-center">
<td scope="row">{{ forloop.counter }}</td>
<td><a href="{% url 'events:detail_view' event.id %}">
<td><a href="#" data-toggle="modal" data-target="#exampleModalCenter_event{{event.id}}">
{{ event.name }} </a></td>
<td>
{% with contacts=event.contacts.all %}
@ -197,6 +197,8 @@
</td>
<td class="actions">
{% if request.user == event.created_by or request.user.role == 'ADMIN' %}
<a href="{% url 'events:detail_view' event.id %}" class="btn btn-info edit"><i
class="fas fa-eye"></i></a>
<a href="{% url 'events:event_update' event.id %}" class="btn btn-success edit"><i
class="fas fa-pencil-alt"></i></a>
<a href="{% url 'events:event_delete' event.id %}"
@ -318,6 +320,172 @@
</div>
</div>
</div>
{% for event in events %}
<div class="modal fade" id="exampleModalCenter_event{{event.id}}" tabindex="-1" role="dialog"
aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">{{ event.name }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<!-- ... -->
<div class="" id="">
<div class="">
<div class="col-md-12" id="">
<div class="card">
<div class="card-body" id="datashow">
<div class="card-title text-right">
<h5>
<!-- <span class="float-left title">Overview</span> -->
<span style="margin-top: 0px">
<!-- <div class="dropdown buttons_row">
<button class="btn primary_btn dropdown-toggle" type="button" data-toggle="dropdown">Actions
<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="{% url 'events:event_update' event.id %}">Edit</a></li>
</ul>
</div> -->
</span>
</h5>
</div>
<div class="row marl">
<div class="col-md-4">
{% if event.name %}
<div class="filter_col col-md-12" id="iname">
<div class="form-group">
<label class="acc_field_label" for="id_name" data-name="name">Name</label>
<div class="account_field" id="account_name" data-name="name">{{ event.name }}</div>
</div>
</div>
{% endif %}
{% if event.event_type %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_phone" data-name="name">Event Type</label>
<div class="account_field" id="account_phone" data-name="name">{{ event.event_type }}</div>
</div>
</div>
{% endif %}
{% if event.start_date %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_status" data-name="name">Start Date</label>
<div class="account_field" id="account_status" data-name="name">{{ event.start_date }}</div>
</div>
</div>
{% endif %}
{% if event.end_date %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_status" data-name="name">End Date</label>
<div class="account_field" id="account_status" data-name="name">{{ event.end_date }}</div>
</div>
</div>
{% endif %}
</div>
<div class="col-md-4">
<div class="filter_col col-md-12">
<div class="form-group">
{% with contacts=event.contacts.all %}
<label class="acc_field_label" for="id_website" data-name="name">Contacts</label>
{% if contacts %}
{% for contact in contacts %}
<div class="account_field" id="account_website" data-name="name">{{ contact }}</div>
{% endfor %}
{% else %}
<div class="account_field" id="account_website" data-name="name">None</div>
{% endif %}
{% endwith %}
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
{% with users=event.assigned_to.all %}
<label class="acc_field_label" for="id_website" data-name="name">Assigned To</label>
{% if users %}
{% for user in users %}
<div class="account_field" id="account_website" data-name="name">
<a href="{% url 'common:view_user' user.id %}">
{{ user }}
</a>
</div>
{% endfor %}
{% else %}
<div class="account_field" id="account_website" data-name="name">None</div>
{% endif %}
{% endwith %}
</div>
</div>
{% if event.start_time %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Start Time</label>
<div class="account_field" id="account_website" data-name="name">{{event.start_time}}</div>
</div>
</div>
{% endif %}
{% if event.end_time %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">End Time</label>
<div class="account_field" id="account_website" data-name="name">{{event.end_time}}</div>
</div>
</div>
{% endif %}
</div>
<div class="col-md-4">
{% if event.description %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Description</label>
<div class="account_field" id="account_website" data-name="name">{{ event.description }}</div>
</div>
</div>
{% endif %}
{% if event.date_of_meeting %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Date Of Meeting</label>
<div class="account_field" id="account_website" data-name="name">{{ event.date_of_meeting }}
</div>
</div>
</div>
{% endif %}
</div>
</div>
</div>
<div class="col-md-12">
<div class="created_information">
Created by <b>{{ event.created_by }}</b> created on
<b>{{ event.created_on }}</b>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div> -->
{% endfor %}
{% endblock %}
{% block js_block %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>

View file

@ -143,7 +143,7 @@
{% for invoice in invoices %}
<tr class="text-center">
<td scope="row">{{ forloop.counter }}</td>
<td><a href="{% url 'invoices:invoice_details' invoice.id %}">
<td><a href="#" data-toggle="modal" data-target="#exampleModalCenter_invoice{{invoice.id}}">
{{ invoice.invoice_title }} </a></td>
<td>{{ invoice.invoice_number }} </td>
<td>{{ invoice.email }} </td>
@ -188,6 +188,8 @@
<a href="{% url 'invoices:invoice_edit' invoice.id %}" class="btn btn-success edit"><i
class="fas fa-pencil-alt"></i></a>
{% if request.user == invoice.created_by or request.user.role == "ADMIN" or request.user.is_superuser %}
<a href="{% url 'invoices:invoice_details' invoice.id %}" class="btn btn-info edit"><i
class="fas fa-eye"></i></a>
<a href="{% url 'invoices:invoice_delete' invoice.id %}"
class="btn btn-danger delete remove_account"><i class="fas fa-trash-alt"></i></a>
{% if invoice.is_draft %}
@ -330,6 +332,222 @@
</div>
</div>
</div>
{% for invoice in invoices %}
<div class="modal fade" id="exampleModalCenter_invoice{{invoice.id}}" tabindex="-1" role="dialog"
aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">{{ invoice.invoice_title }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<!-- ... -->
<div class="" id="">
<div class="">
<div class="col-md-12" id="">
<div class="card">
<div class="card-body" id="datashow">
<div class="card-title text-right">
<h5>
<!-- <span class="float-left title">Overview</span> -->
<span style="margin-top: 0px">
<!-- <div class="dropdown buttons_row">
<a href="{% url 'invoices:invoice_download' invoice.id %}" id="download_btn_"
class="btn btn-info" style="padding: 0.12em 0.6em;border-radius: 0;">Download</a>
<button class="btn primary_btn dropdown-toggle" type="button" data-toggle="dropdown">Actions
<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="{% url 'invoices:invoice_edit' invoice.id %}">Edit</a></li>
</ul>
</div> -->
</span>
</h5>
</div>
<div class="row marl">
<div class="col-md-4">
{% if invoice.invoice_title %}
<div class="filter_col col-md-12" id="iname">
<div class="form-group">
<label class="acc_field_label" for="id_name" data-name="name">Invoice Title</label>
<div class="account_field" id="account_name" data-name="name">{{ invoice.invoice_title }}
</div>
</div>
</div>
{% endif %}
{% if invoice.invoice_number %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_phone" data-name="name">Invoice Number</label>
<div class="account_field" id="account_phone" data-name="name">{{ invoice.invoice_number }}
</div>
</div>
</div>
{% endif %}
{% if invoice.name %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_status" data-name="name">Name</label>
<div class="account_field" id="account_status" data-name="name">{{ invoice.name }}</div>
</div>
</div>
{% endif %}
{% if invoice.email %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_status" data-name="name">Email</label>
<div class="account_field" id="account_status" data-name="name">{{ invoice.email }}</div>
</div>
</div>
{% endif %}
{% if invoice.phone %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_status" data-name="name">Phone</label>
<div class="account_field" id="account_status" data-name="name">{{ invoice.phone }}</div>
</div>
</div>
{% endif %}
</div>
<div class="col-md-4">
{% if invoice.quantity %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_due_date" data-name="name">Quantity</label>
<div class="account_field" id="account_email" data-name="name">{{ invoice.quantity }}</div>
</div>
</div>
{% endif %}
{% if invoice.rate %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_email" data-name="name">Rate</label>
<div class="account_field" id="account_email" data-name="name">{{ invoice.rate }}</div>
</div>
</div>
{% endif %}
{% if invoice.total_amount %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_email" data-name="name">Total Amount</label>
<div class="account_field" id="account_email" data-name="name">{{ invoice.total_amount }}
</div>
</div>
</div>
{% endif %}
{% if invoice.currency %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Currency</label>
<div class="account_field" id="account_website" data-name="name">{{ invoice.currency }}</div>
</div>
</div>
{% endif %}
{% if invoice.status %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Status</label>
<div class="account_field" id="account_website" data-name="name">{{ invoice.status }}</div>
</div>
</div>
{% endif %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Email Status</label>
{% if invoice.is_email_sent %}
<div class="account_field" id="account_website" data-name="name">Email was sent.</div>
{% else %}
<div class="account_field" id="account_website" data-name="name">No Email sent.</div>
{% endif %}
</div>
</div>
</div>
<div class="col-md-4">
{% if invoice.due_date %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Due Date</label>
<div class="account_field" id="account_website" data-name="name">{{ invoice.due_date }}</div>
</div>
</div>
{% endif %}
{% if invoice.details %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Details</label>
<div class="account_field" id="account_website" data-name="name">{{ invoice.details }}</div>
</div>
</div>
{% endif %}
{% if invoice.assigned_to.all %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Assigned To</label>
{% for user in invoice.assigned_to.all %}
<div class="account_field" id="account_website" data-name="name">
<a href="{% url 'common:view_user' user.id %}">
{{ user }}
</a>
</div>
{% endfor %}
</div>
</div>
{% endif %}
<div class="filter_col col-md-12">
<div class="form-group">
{% if invoice.from_address.address_line or invoice.from_address.street or invoice.from_address.city or invoice.from_address.state or invoice.from_address.postcode or invoice.from_address.country %}
<label class="lead_field_label" for="id_address" data-name="name">From Billing Address</label>
<div class="lead_field" id="lead_address" data-name="name">
{{invoice.from_address.get_complete_address}}
</div>
{% endif %}
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
{% if invoice.to_address.address_line or invoice.to_address.street or invoice.to_address.city or invoice.to_address.state or invoice.to_address.postcode or invoice.to_address.country %}
<label class="lead_field_label" for="id_address" data-name="name">To Billing Address</label>
<div class="lead_field" id="lead_address" data-name="name">
{{invoice.to_address.get_complete_address}}
</div>
{% endif %}
</div>
</div>
</div>
<div class="col-md-12">
<div class="created_information">
Created by <b>{{ invoice.created_by }}</b> created on
<b>{{ invoice.created_on }}</b>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div> -->
{% endfor %}
{% endblock %}
{% block js_block %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>

View file

@ -1,12 +1,13 @@
import arrow
from django.db import models
from django.utils.translation import pgettext_lazy
from django.utils.translation import ugettext_lazy as _
from common.models import User
from common.utils import (LEAD_STATUS, LEAD_SOURCE,
COUNTRIES, return_complete_address)
from phonenumber_field.modelfields import PhoneNumberField
from accounts.models import Tags
from common.models import User
from common.utils import (COUNTRIES, LEAD_SOURCE, LEAD_STATUS,
return_complete_address)
from contacts.models import Contact
@ -66,3 +67,7 @@ class Lead(models.Model):
def get_complete_address(self):
return return_complete_address(self)
@property
def created_on_arrow(self):
return arrow.get(self.created_on).humanize()

View file

@ -144,8 +144,13 @@
{% for lead in open_leads %}
<tr class="text-center">
<td scope="row">{{ forloop.counter }}</td>
<td><a href="{% url 'leads:view_lead' lead.id %}">
{{ lead.title }} </a></td>
<!-- <td><a href="{% url 'leads:view_lead' lead.id %}">
{{ lead.title }} </a></td> -->
<td>
<a data-toggle="modal" data-target="#exampleModalCenter_lead{{lead.id}}" href="#">
{{ lead.title }}
</a>
</td>
<td>
{% if lead.created_by %}
{% if lead.created_by.profile_pic %}
@ -198,8 +203,10 @@
{% endif %}
{% endwith %}
</td>
<td>{{ lead.created_on }}</td>
<td title="{{ lead.created_on }}">{{ lead.created_on_arrow }}</td>
<td class="actions">
<a href="{% url 'leads:view_lead' lead.id %}" class="btn btn-info edit"><i
class="fas fa-eye"></i></a>
<a href="{% url 'leads:edit_lead' lead.id %}" class="btn btn-success edit"><i
class="fas fa-pencil-alt"></i></a>
{% if request.user == lead.created_by or request.user.role == "ADMIN" or request.user.is_superuser %}
@ -256,7 +263,7 @@
{% for lead in close_leads %}
<tr class="text-center">
<td scope="row">{{ forloop.counter }}</td>
<td><a href="{% url 'leads:view_lead' lead.id %}">
<td><a href="#" data-toggle="modal" data-target="#exampleModalCenter_lead{{lead.id}}">
{{ lead.title }}</a></td>
<td>{{ lead.source }}</td>
<td>{{ lead.get_status_display }}</td>
@ -293,6 +300,8 @@
</td>
<td>{{ lead.created_on }}</td>
<td class="actions">
<a href="{% url 'leads:view_lead' lead.id %}" class="btn btn-info edit"><i
class="fas fa-eye"></i></a>
<a href="{% url 'leads:edit_lead' lead.id %}" class="btn btn-success edit"><i
class="fas fa-pencil-alt"></i></a>
{% if request.user == lead.created_by %}
@ -319,6 +328,334 @@
</div>
</div>
</div>
{% for lead_record in open_leads %}
<div class="modal fade" id="exampleModalCenter_lead{{lead_record.id}}" tabindex="-1" role="dialog"
aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">{{lead_record.title}}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<!-- ... -->
<div class=" ">
<div class="col-md-12" id="">
<div class="card">
<div class="card-body" id="datashow">
<div class="card-title text-right">
<h5>
<!-- <span class="float-left title">Overview</span> -->
<span class="" style="margin-top: 0px">
<div class="dropdown buttons_row">
<!-- <button class="btn primary_btn dropdown-toggle" type="button" data-toggle="dropdown">Actions
<span class="caret"></span></button> -->
</div>
</span>
</h5>
</div>
<div class="row marl">
<div class="col-md-4">
<div class="filter_col col-md-12" id="iname">
<div class="form-group">
<label class="lead_field_label" for="id_name" data-name="name">Name</label>
<div class="lead_field" id="lead_name" data-name="name"> {% if lead_record.first_name %}
{{ lead_record.first_name }}{% endif %} {% if lead_record.last_name %}
{{ lead_record.last_name }}{% endif %}</div>
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="lead_field_label" for="id_contact_account" data-name="name">Account Name</label>
{% if lead_record.account_name %}
<div class="lead_field" id="contact_account" data-name="name">{{ lead_record.account_name }}
</div>
{% else %}
<div class="lead_field">Not Specified</div>
{% endif %}
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="lead_field_label" for="id_title" data-name="name">Title</label>
{% if lead_record.title %}
<div class="lead_field" id="lead_title" data-name="name">{{ lead_record.title }}</div>
{% else %}
<div class="lead_field">Not Specified</div>
{% endif %}
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="lead_field_label" for="id_phone" data-name="name">Phone</label>
{% if lead_record.phone %}
<div class="lead_field" id="lead_phone" data-name="name">{{ lead_record.phone }}</div>
{% else %}
<div class="lead_field">Not specified</div>
{% endif %}
</div>
</div>
</div>
<div class="col-md-4">
<div class="filter_col col-md-12">
<div class="form-group">
<label class="lead_field_label" for="id_email" data-name="name">Email</label>
{% if lead_record.email %}
<div class="lead_field" id="lead_email" data-name="name">{{ lead_record.email }}</div>
{% else %}
<div class="lead_field">Not Specified</div>
{% endif %}
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="lead_field_label" for="id_status" data-name="name">Status</label>
{% if lead_record.status %}
<div class="lead_field" id="lead_status" data-name="name">{{ lead_record.status }}</div>
{% else %}
<div class="lead_field">Not Specified</div>
{% endif %}
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="lead_field_label" for="id_source" data-name="name">Source</label>
{% if lead_record.source %}
<div class="lead_field" id="lead_source" data-name="name">{{ lead_record.source }}</div>
{% else %}
<div class="lead_field">Not Specified</div>
{% endif %}
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="lead_field_label" for="id_website" data-name="name">Website</label>
{% if lead_record.website %}
<div class="lead_field" id="lead_website" data-name="name">{{ lead_record.website }}</div>
{% else %}
<div class="lead_field">Not Specified</div>
{% endif %}
</div>
</div>
</div>
<div class="col-md-4">
<div class="filter_col col-md-12">
<div class="form-group">
{% if lead_record.address_line or lead_record.street or lead_record.city or lead_record.state or lead_record.postcode or lead_record.country %}
<label class="lead_field_label" for="id_address" data-name="name">Billing Address</label>
<div class="lead_field" id="lead_address" data-name="name">
{{lead_record.get_complete_address}}
</div>
{% endif %}
</div>
</div>
<div class="filter_col col-md-12">
{% if lead_record.description %}
<div class="form-group">
<label class="lead_field_label" for="id_description" data-name="name">Description</label>
<div class="lead_field" id="lead_description" data-name="name">{{ lead_record.description }}
</div>
</div>
{% endif %}
</div>
</div>
<div class="col-md-12">
<div class="created_information">
Created by <b>{{ lead_record.created_by }}</b> created on <b>{{ lead_record.created_on }}</b>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div> -->
</div>
</div>
{% endfor %}
{% for lead_record in close_leads %}
<div class="modal fade" id="exampleModalCenter_lead{{lead_record.id}}" tabindex="-1" role="dialog"
aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">{{lead_record.title}}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<!-- ... -->
<div class=" ">
<div class="col-md-12" id="">
<div class="card">
<div class="card-body" id="datashow">
<div class="card-title text-right">
<h5>
<!-- <span class="float-left title">Overview</span> -->
<span class="" style="margin-top: 0px">
<div class="dropdown buttons_row">
<!-- <button class="btn primary_btn dropdown-toggle" type="button" data-toggle="dropdown">Actions
<span class="caret"></span></button> -->
</div>
</span>
</h5>
</div>
<div class="row marl">
<div class="col-md-4">
<div class="filter_col col-md-12" id="iname">
<div class="form-group">
<label class="lead_field_label" for="id_name" data-name="name">Name</label>
<div class="lead_field" id="lead_name" data-name="name"> {% if lead_record.first_name %}
{{ lead_record.first_name }}{% endif %} {% if lead_record.last_name %}
{{ lead_record.last_name }}{% endif %}</div>
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="lead_field_label" for="id_contact_account" data-name="name">Account Name</label>
{% if lead_record.account_name %}
<div class="lead_field" id="contact_account" data-name="name">{{ lead_record.account_name }}
</div>
{% else %}
<div class="lead_field">Not Specified</div>
{% endif %}
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="lead_field_label" for="id_title" data-name="name">Title</label>
{% if lead_record.title %}
<div class="lead_field" id="lead_title" data-name="name">{{ lead_record.title }}</div>
{% else %}
<div class="lead_field">Not Specified</div>
{% endif %}
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="lead_field_label" for="id_phone" data-name="name">Phone</label>
{% if lead_record.phone %}
<div class="lead_field" id="lead_phone" data-name="name">{{ lead_record.phone }}</div>
{% else %}
<div class="lead_field">Not specified</div>
{% endif %}
</div>
</div>
</div>
<div class="col-md-4">
<div class="filter_col col-md-12">
<div class="form-group">
<label class="lead_field_label" for="id_email" data-name="name">Email</label>
{% if lead_record.email %}
<div class="lead_field" id="lead_email" data-name="name">{{ lead_record.email }}</div>
{% else %}
<div class="lead_field">Not Specified</div>
{% endif %}
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="lead_field_label" for="id_status" data-name="name">Status</label>
{% if lead_record.status %}
<div class="lead_field" id="lead_status" data-name="name">{{ lead_record.status }}</div>
{% else %}
<div class="lead_field">Not Specified</div>
{% endif %}
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="lead_field_label" for="id_source" data-name="name">Source</label>
{% if lead_record.source %}
<div class="lead_field" id="lead_source" data-name="name">{{ lead_record.source }}</div>
{% else %}
<div class="lead_field">Not Specified</div>
{% endif %}
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="lead_field_label" for="id_website" data-name="name">Website</label>
{% if lead_record.website %}
<div class="lead_field" id="lead_website" data-name="name">{{ lead_record.website }}</div>
{% else %}
<div class="lead_field">Not Specified</div>
{% endif %}
</div>
</div>
</div>
<div class="col-md-4">
<div class="filter_col col-md-12">
<div class="form-group">
{% if lead_record.address_line or lead_record.street or lead_record.city or lead_record.state or lead_record.postcode or lead_record.country %}
<label class="lead_field_label" for="id_address" data-name="name">Billing Address</label>
<div class="lead_field" id="lead_address" data-name="name">
{{lead_record.get_complete_address}}
</div>
{% endif %}
</div>
</div>
<div class="filter_col col-md-12">
{% if lead_record.description %}
<div class="form-group">
<label class="lead_field_label" for="id_description" data-name="name">Description</label>
<div class="lead_field" id="lead_description" data-name="name">{{ lead_record.description }}
</div>
</div>
{% endif %}
</div>
</div>
<div class="col-md-12">
<div class="created_information">
Created by <b>{{ lead_record.created_by }}</b> created on <b>{{ lead_record.created_on }}</b>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div> -->
</div>
</div>
{% endfor %}
{% endblock %}
{% block js_block %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>

View file

@ -36,8 +36,10 @@
<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="{% url 'leads:edit_lead' lead_record.id %}">Edit</a></li>
<li><a href="{% url 'leads:leads_convert' lead_record.id %}" class="btn btn-info"
<li><a href="{% url 'leads:leads_convert' lead_record.id %}" class=""
role="button">Convert</a></li>
<!-- <li><a href="{% url 'leads:leads_convert' lead_record.id %}" class="btn btn-info"
role="button">Convert</a></li> -->
</ul>
</div>
</span>

View file

@ -11,7 +11,7 @@ from marketing.models import (
EmailTemplate, Campaign, Tag
)
email_regex = '^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$'
email_regex = '^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*(\.[a-zA-Z]{2,4})$'
def csv_doc_validate(document):

View file

@ -117,7 +117,7 @@
<th width="5%">S.No</th>
<th width="10%">Name</th>
<th width="20%">Assigned To</th>
<th width="15%">Tags</th>
<th width="10%">Tags</th>
<th width="15%">Account</th>
<!--<th width="15%">Contact(s)</th>-->
<th width="15%">Stage</th>
@ -135,7 +135,9 @@
{% for opportunity in opportunity_list %}
<tr class="text-center">
<td scope="row">{{ forloop.counter }}</td>
<td><a href="{% url 'opportunities:opp_view' opportunity.id %}">{{ opportunity.name }}</a></td>
<td><a href="#"
data-toggle="modal"
data-target="#exampleModalCenter_opportunity{{opportunity.id}}">{{ opportunity.name }}</a></td>
<td>
{% with opportunity_users=opportunity.assigned_to.all %}
{% for user in opportunity_users %}
@ -188,7 +190,7 @@
<td>{% if opportunity.lead_source %}{{ opportunity.lead_source }}{% else %}Not Specified{% endif %}
</td>
<td class="actions">
<!-- <a href="{% url 'opportunities:opp_view' opportunity.id %}" class="btn btn-info view"><i class="fas fa-eye"></i> View</a> -->
<a href="{% url 'opportunities:opp_view' opportunity.id %}" class="btn btn-info view"><i class="fas fa-eye"></i></a>
<a href="{% url 'opportunities:opp_edit' opportunity.id %}" class="btn btn-success edit"><i
class="fas fa-pencil-alt"></i></a>
{% if request.user == opportunity.created_by or request.user.role == "ADMIN" or request.user.is_superuser %}
@ -216,6 +218,170 @@
<!-- filter_row starts here -->
</div>
{% for opportunity_record in opportunity_list %}
<div class="modal fade" id="exampleModalCenter_opportunity{{opportunity_record.id}}" tabindex="-1" role="dialog"
aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">{{ opportunity_record.name }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<!-- ... -->
<div class="" id="">
<div class="">
<div class="col-md-12" id="">
<div class="card">
<div class="card-body" id="datashow">
<div class="card-title text-right">
<h5>
<!-- <span class="float-left">OVERVIEW</span> -->
<span class="" style="margin-top: 0px">
<!-- <div class="dropdown buttons_row">
<button class="btn primary_btn dropdown-toggle" type="button" data-toggle="dropdown">Actions
<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="{% url 'opportunities:opp_edit' opportunity_record.id %}">Edit</a></li>
</ul>
</div> -->
</span>
</h5>
</div>
<div class="row marl">
<div class="col-md-4">
<div class="filter_col col-md-12" id="iname">
<div class="form-group">
<label class="opportunity_field_label" for="id_name" data-name="name">Name</label>
<div class="opportunity_field" id="opportunity_name" data-name="name">
{{ opportunity_record.name }}
</div>
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="opportunity_field_label" for="id_opportunity_account"
data-name="name">Account</label>
<div class="opportunity_field" id="opportunity_account" data-name="name">
{{ opportunity_record.account }}</div>
</div>
</div>
<div class="filter_col col-md-12">
{% if opportunity_record.contacts.all %}
<div class="form-group">
<label class="opportunity_field_label" for="id_contact" data-name="name">Contact(s)</label>
<div class="opportunity_field" id="opportunity_contact" data-name="name">
{% for contact in opportunity_record.contacts.all %}
<li>{{ contact }}</li>
{% endfor %}
</div>
</div>
{% endif %}
</div>
<div class="filter_col col-md-12">
{% if opportunity_record.amount %}
<div class="form-group">
<label class="opportunity_field_label" for="id_amount" data-name="name">Amount</label>
<div class="opportunity_field" id="opportunity_amount" data-name="name">
{{ opportunity_record.currency }} {{ opportunity_record.amount }}</div>
</div>
{% endif %}
</div>
</div>
<div class="col-md-4">
<div class="filter_col col-md-12">
{% if opportunity_record.stage %}
<div class="form-group">
<label class="opportunity_field_label" for="id_stage" data-name="name">Stage</label>
<div class="opportunity_field" id="opportunity_stage" data-name="name">
{{ opportunity_record.stage }}
</div>
</div>
{% endif %}
</div>
<div class="filter_col col-md-12">
{% if opportunity_record.lead_source %}
<div class="form-group">
<label class="opportunity_field_label" for="id_lead_source" data-name="name">Lead
Source</label>
<div class="opportunity_field" id="opportunity_lead_source" data-name="name">
{{ opportunity_record.lead_source }}</div>
</div>
{% endif %}
</div>
<div class="filter_col col-md-12">
{% if opportunity_record.probability %}
<div class="form-group">
<label class="opportunity_field_label" for="id_probability"
data-name="name">Probability</label>
<div class="opportunity_field" id="opportunity_probability" data-name="name">
{{opportunity_record.probability}} %</div>
</div>
{% endif %}
</div>
<div class="filter_col col-md-12">
{% if opportunity_record.closed_on %}
<div class="form-group">
<label class="opportunity_field_label" for="id_close_date" data-name="name">Close Date</label>
<div class="opportunity_field" id="opportunity_close_date" data-name="name">
{{opportunity_record.closed_on|date}}</div>
</div>
{% endif %}
</div>
</div>
<div class="col-md-4">
<div class="filter_col col-md-12">
{% if opportunity_record.description %}
<div class="form-group">
<label class="opportunity_field_label" for="id_description"
data-name="name">Description</label>
<div class="opportunity_field" id="opportunity_description" data-name="name">
{{opportunity_record.description}}</div>
</div>
{% endif %}
</div>
{% if opportunity_record.tags.all %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_tags" data-name="name">Tags</label>
<div class="account_field" id="account_tags" data-name="name">
{% for tag in opportunity_record.tags.all %}
<span class="text-left" id="list_tag">{{ tag.name }}</span>
{% endfor %}
</div>
</div>
</div>
{% endif %}
</div>
<div class="col-md-12">
<div class="created_information">
Created by <b>{{ opportunity_record.created_by }}</b> created on
<b>{{ opportunity_record.created_on }}</b>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div> -->
</div>
</div>
{% endfor %}
<!-- main_container ends here -->
{% endblock %}
{% block js_block %}

View file

@ -1,4 +1,4 @@
Django==2.2.2
Django==2.2.3
boto==2.49.0
boto3==1.9.94
django-simple-pagination==1.3
@ -25,3 +25,4 @@ vine==1.2.0
openpyxl==2.6.0
lxml==4.3.2
cssselect==1.0.3
arrow==0.14.2

View file

@ -116,7 +116,7 @@
{% if task.due_date < today and task.status != 'completed' %}
<tr id="task_{{task.id}}" class="text-center due-date">
<td scope="row">{{ forloop.counter }}</td>
<td>{% if task.title %}<a href="{% url 'tasks:task_detail' task.id %}"
<td>{% if task.title %}<a href="#" data-toggle="modal" data-target="#exampleModalCenter_task{{task.id}}"
style="color:red;">{{ task.title }}</a>{% endif %}
</td>
<td>
@ -165,6 +165,8 @@
</td>
<td class="actions">
{% if request.user == task.created_by or request.user.role == 'ADMIN' %}
<a href="{% url 'tasks:task_detail' task.id %}" class="btn btn-info edit"><i
class="fas fa-eye"></i></a>
<a href="{% url 'tasks:task_edit' task.id %}" class="btn btn-success edit"><i
class="fas fa-pencil-alt"></i></a>
<a href="{% url 'tasks:task_delete' task.id %}" class="btn btn-danger delete remove_document"><i
@ -176,7 +178,7 @@
{% else %}
<tr id="task_{{task.id}}" class="text-center">
<td scope="row">{{ forloop.counter }}</td>
<td>{% if task.title %}<a href="{% url 'tasks:task_detail' task.id %}">{{ task.title }}</a>{% endif %}
<td>{% if task.title %}<a data-toggle="modal" data-target="#exampleModalCenter_task{{task.id}}">{{ task.title }}</a>{% endif %}
</td>
<td>
{% if task.created_by %}
@ -225,6 +227,8 @@
</td>
<td class="actions">
{% if request.user == task.created_by or request.user.role == 'ADMIN' %}
<a href="{% url 'tasks:task_detail' task.id %}" class="btn btn-info edit"><i
class="fas fa-eye"></i></a>
<a href="{% url 'tasks:task_edit' task.id %}" class="btn btn-success edit"><i
class="fas fa-pencil-alt"></i></a>
<a href="{% url 'tasks:task_delete' task.id %}" class="btn btn-danger delete remove_document"><i
@ -236,7 +240,7 @@
{% else %}
<tr id="task_{{task.id}}" class="text-center">
<td scope="row">{{ forloop.counter }}</td>
<td>{% if task.title %}<a href="{% url 'tasks:task_detail' task.id %}">{{ task.title }}</a>{% endif %}
<td>{% if task.title %}<a href="#" data-toggle="modal" data-target="#exampleModalCenter_task{{task.id}}">{{ task.title }}</a>{% endif %}
</td>
<td>
{% if task.created_by %}
@ -284,6 +288,8 @@
</td>
<td class="actions">
{% if request.user == task.created_by or request.user.role == 'ADMIN' %}
<a href="{% url 'tasks:task_detail' task.id %}" class="btn btn-info edit"><i
class="fas fa-eye"></i></a>
<a href="{% url 'tasks:task_edit' task.id %}" class="btn btn-success edit"><i
class="fas fa-pencil-alt"></i></a>
<a href="{% url 'tasks:task_delete' task.id %}" class="btn btn-danger delete remove_document"><i
@ -314,6 +320,138 @@
<!-- accounts list end -->
</div>
<!-- main_container ends here -->
{% for task in tasks %}
<div class="modal fade" id="exampleModalCenter_task{{task.id}}" tabindex="-1" role="dialog"
aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">{{ task.title }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<!-- ... -->
<div class="" id="">
<div class="">
<div class="col-md-12" id="opacity_block">
<div class="card">
<div class="card-body" id="datashow">
<div class="card-title text-right">
<h5>
<!-- <span class="float-left title">Overview</span> -->
<span style="margin-top: 0px">
<!-- <div class="dropdown buttons_row">
<button class="btn primary_btn dropdown-toggle" type="button" data-toggle="dropdown">Actions
<span class="caret"></span></button>
<ul class="dropdown-menu">
<li><a href="{% url 'tasks:task_edit' task.id %}">Edit</a></li>
<li><a href="{% url 'tasks:task_delete' task.id %}">Delete</a></li>
</ul>
</div> -->
</span>
</h5>
</div>
<div class="row marl">
<div class="col-md-4">
{% if task.title %}
<div class="filter_col col-md-12" id="iname">
<div class="form-group">
<label class="acc_field_label" for="id_name" data-name="name">title</label>
<div class="account_field" id="account_name" data-name="name">{{ task.title }}</div>
</div>
</div>
{% endif %}
{% if task.priority %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_phone" data-name="name">Priority</label>
<div class="account_field" id="account_phone" data-name="name">{{ task.priority }}</div>
</div>
</div>
{% endif %}
{% if task.status %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_status" data-name="name">Status</label>
<div class="account_field" id="account_status" data-name="name">{{ task.status }}</div>
</div>
</div>
{% endif %}
</div>
<div class="col-md-4">
{% if task.due_date %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_due_date" data-name="name">Due Date</label>
<div class="account_field" id="account_email" data-name="name">{{ task.due_date }}</div>
</div>
</div>
{% endif %}
{% if task.account %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_email" data-name="name">Account</label>
<div class="account_field" id="account_email" data-name="name">{{ task.account }}</div>
</div>
</div>
{% endif %}
{% if task.contacts.all %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Contacts</label>
{% for contact in task.contacts.all %}
<div class="account_field" id="account_website" data-name="name">{{ contact }}</div>
{% endfor %}
</div>
</div>
{% endif %}
</div>
<div class="col-md-4">
{% if task.assigned_to.all %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="acc_field_label" for="id_website" data-name="name">Assigned To</label>
{% for user in task.assigned_to.all %}
<div class="account_field" id="account_website" data-name="name">
<a href="{% url 'common:view_user' user.id %}">
{{ user }}
</a>
</div>
{% endfor %}
</div>
</div>
{% endif %}
</div>
<div class="col-md-12">
<div class="created_information">
Created by <b>{{ task.created_by }}</b>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div> -->
</div>
</div>
{% endfor %}
{% endblock %}
{% block js_block %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>

View file

@ -120,7 +120,7 @@
{% for team in teams %}
<tr class="text-center">
<td scope="row">{{ forloop.counter }}</td>
<td><a href="{% url 'teams:team_detail' team.id %}">
<td><a href="#" data-toggle="modal" data-target="#exampleModalCenter_team{{team.id}}">
{{ team.name }} </a></td>
<td>{{ team.description }} </td>
<td>
@ -161,6 +161,8 @@
<td>{{ team.created_on|date:'d-m-Y' }}</td>
<td class="actions">
{% if request.user == team.created_by or request.user.role == 'ADMIN' or reques.user.is_superuser %}
<a href="{% url 'teams:team_detail' team.id %}" class="btn btn-info edit"><i
class="fas fa-eye"></i></a>
<a href="{% url 'teams:team_edit' team.id %}" class="btn btn-success edit"><i
class="fas fa-pencil-alt"></i></a>
<a href="{% url 'teams:team_delete' team.id %}"
@ -186,6 +188,114 @@
</div>
</div>
</div>
{% for team_obj in teams %}
<div class="modal fade" id="exampleModalCenter_team{{team_obj.id}}" tabindex="-1" role="dialog"
aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLongTitle">{{ team_obj.name }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="" id="">
<div class="">
<div class="col-md-12">
<div class="card">
<div class="card-body" id="datashow">
<div class="panel-heading card-title view-pad text-center">
<h5>
Team
</h5>
</div>
<div class="row marl no-gutters">
<div class="col-md-8">
{% if team_obj.name %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="contact_field_label" for="id_title" data-name="title">Name</label>
<div class="contact_field" id="doc_title" data-name="name">{{ team_obj.name }}
</div>
</div>
</div>
{% endif %}
{% if team_obj.description %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="contact_field_label" for="id_status" data-name="status">Description</label>
<div class="contact_field" id="doc_status" data-name="status">
{{ team_obj.description }} </div>
</div>
</div>
{% endif %}
<div class="filter_col col-md-12">
<div class="form-group">
<label class="contact_field_label" for="id_status" data-name="status">Assigned To</label>
<br>
{% with users=team_obj.users.all %}
{% for user in users %}
{% if user.profile_pic %}
{% thumbnail user.profile_pic "40x40" crop="center" as im %}
<span>
<a href="{% url 'common:view_user' user.id %}">
<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}"
title="{{ user.email }}">
</a>
</span>
{% endthumbnail %}
{% else %}
<span>
<a href="{% url 'common:view_user' user.id %}">
<img src="{% static 'images/user.png' %}" title="{{ user.email }}" width="40" height="40">
</a>
</span>
{% endif %}
{% empty %}
None
</div>
</div>
{% endfor %}
{% endwith %}
<div class="filter_col col-md-12">
<div class="form-group mt-3">
<label class="contact_field_label" for="id_created_by" data-name="created_by">Created
By</label>
<div class="contact_field" id="created_by" data-name="created_by">
{{ team_obj.created_by }}</div>
</div>
</div>
<div class="filter_col col-md-12">
<div class="form-group">
<label class="contact_field_label" for="id_created_on" data-name="created_on">Created
On</label>
<div class="contact_field" id="created_on" data-name="created_on">
{{ team_obj.created_on }}</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary">Save changes</button>
</div> -->
</div>
</div>
</div>
{% endfor %}
{% endblock %}
{% block js_block %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>