- {% ratings_widget answer.author.pk 'restList2' %}
+ {% if answer.author|class_name == 'User' %}
+ {% ratings_widget answer.author.pk 'restList2' %}
+ {% elif answer.author|class_name == 'Team'%}
+ {% ratings_team_widget answer.author.pk 'restList2' %}
+ {% endif %}
+
{% if answer.author|class_name == 'User' and answer.author.cro %}
@@ -1168,6 +1194,57 @@
$.cookie('projectAnswerFormVisible', 'true', {expires: new Date(new Date().getTime() + 300000)})
}
}
+
+
+ $('.offer-order-contractor').on('click', function(e){
+ e.preventDefault()
+
+ var senderId = $(this).attr('data-sender-id')
+ var recipentId = $(this).attr('data-recipent-id')
+ var orderId = $(this).attr('data-order-id')
+
+ var msg = 'Вас выбрали исполнителем для заказа '
+
+ socketMain.add_message({
+ format_type: 'add_message_contact',
+ message_type: 'offer_order',
+ data: {
+ sender_id: String(senderId),
+ recipent_id: String(recipentId),
+ order_id: String(orderId),
+ chat_message: msg,
+ },
+ })
+
+ $(this).closest('form').submit()
+
+
+ })
+
+ $('.reject-project-link').on('click', function(e){
+ e.preventDefault();
+ var projectId = $(this).attr('data-project-id')
+ var msg = 'Вам отказано по проекту " ' + $(this).attr("data-order-name") + '"
Перейти'
+ var customerId = $(this).attr('data-sender-id')
+ var contractorId = $(this).attr('data-recipent-id')
+ socketMain.add_message({
+ format_type: 'add_message_contact',
+ message_type: 'reject_order',
+ data: {
+ sender_id: String(customerId),
+ recipent_id: String(contractorId),
+ chat_message: msg,
+ },
+ })
+ $(this).closest('form').submit();
+
+ })
+
+ $('.reject-project-link-contractor').on('click', function(e){
+ e.preventDefault();
+ $(this).closest('form').submit();
+
+ })
window.toggleProjectAnswerForm = toggleProjectAnswerForm
}())
diff --git a/users/models.py b/users/models.py
index ab3263b..65871f5 100644
--- a/users/models.py
+++ b/users/models.py
@@ -170,7 +170,7 @@ class User(AbstractBaseUser, PermissionsMixin):
return self.email
def get_full_name(self):
- full_name = self.first_name + ' ' + self.last_name
+ full_name = self.first_name + ' ' + self.last_name + ' ' + self.patronym
return full_name or self.username
def get_profile_image(self):
diff --git a/users/templates/contractor_filter.html b/users/templates/contractor_filter.html
index 96d13c9..4f83f33 100644
--- a/users/templates/contractor_filter.html
+++ b/users/templates/contractor_filter.html
@@ -459,7 +459,7 @@
if (project.order.team && project.order.team.id === teamId) {
window.location.href = projectOrderChatUrl
} else {
- var msg = 'Вашей команде предлагается проект
http://{{ request.get_host }}' + projectUrl +''
+ var msg = 'Вашей команде предлагается проект
Перейти к проекту'
socketMain.add_message({
format_type: 'add_message_contact',
@@ -480,7 +480,7 @@
if (project.order.contractor && project.order.contractor.id === contractorId) {
window.location.href = projectOrderChatUrl
} else {
- var msg = 'Вам предлагается проект
http://{{ request.get_host }}' + projectUrl +''
+ var msg = 'Вам предлагается проект
Перейти к проекту'
socketMain.add_message({
format_type: 'add_message_contact',
diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html
index ea74d44..abba5e7 100644
--- a/users/templates/contractor_office.html
+++ b/users/templates/contractor_office.html
@@ -389,7 +389,7 @@
data: {
sender_id: '{{ contractor.pk }}',
recipent_id: String(contractor2Id),
- chat_message: 'Приглашаю в группу
http://{{ request.get_host }}{% url 'users:accept-team-invitation' owner_id=contractor.pk %}',
+ chat_message: 'Приглашаю в группу "{{ contractor.team.name }}"
Присоединиться',
},
})
diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html
index 7324aaf..25b187c 100644
--- a/users/templates/contractor_profile.html
+++ b/users/templates/contractor_profile.html
@@ -738,11 +738,11 @@
if (res.status === 'success') {
socketMain.add_message({
format_type: 'add_message_contact',
-
+ message_type: 'invite_team',
data: {
sender_id: '{{ request.user.pk }}',
recipent_id: '{{ contractor.pk }}',
- chat_message: 'Приглашаю в группу http://{{ request.get_host }}{% url 'users:accept-team-invitation' owner_id=request.user.pk %}',
+ chat_message: 'Приглашаю в группу "{{ request.user.team.name }}"
Присоединиться',
},
})
@@ -794,11 +794,11 @@
if (project.order.contractor && project.order.contractor.id === contractorId) {
window.location.href = projectOrderChatUrl
} else {
- var msg = 'Вам предлагается проект http://{{ request.get_host }}' + projectUrl
+ var msg = 'Вам предлагается проект
Перейти к проекту'
socketMain.add_message({
format_type: 'add_message_contact',
-
+ message_type: 'invite_order',
data: {
sender_id: String(customerId),
recipent_id: String(contractorId),