Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add recent message block to item_card

Browse Source
This commit is contained in:
Suraj Shetty 2018-08-22 16:47:50 +05:30
parent b361c234b1
commit d94701e5cc
3 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/public/js/hub/components/item_card.js
View File

@ -20,6 +20,24 @@ function get_item_card_html(item) {
item.route = `marketplace/item/${item.hub_item_code}` item.route = `marketplace/item/${item.hub_item_code}`
} }
let recent_message_block = ''
if(item.recent_message) {
let message = item.recent_message
let sender = message.sender === frappe.session.user ? 'You' : message.sender
let content = $('<p>' + message.content + '</p>').text() //https://stackoverflow.com/a/14337611
recent_message_block = `
<div class="hub-recent-message">
<span class='text-muted'>${comment_when(message.creation, true)}</span>
<div class='bold ellipsis'>${message.receiver}</div>
<div class='ellipsis'>
<span>${sender}: </span>
<span>${content}</span>
</div>
</div>
`
}
const item_html = ` const item_html = `
<div class="col-md-3 col-sm-4 col-xs-6 hub-card-container"> <div class="col-md-3 col-sm-4 col-xs-6 hub-card-container">
<div class="hub-card" <div class="hub-card"
@ -39,7 +57,7 @@ function get_item_card_html(item) {
<img class="hub-card-image" src="${img_url}" /> <img class="hub-card-image" src="${img_url}" />
<div class="overlay hub-card-overlay"></div> <div class="overlay hub-card-overlay"></div>
</div> </div>
${recent_message_block}
</div> </div>
</div> </div>
`; `;

2
erpnext/public/js/hub/pages/buying_messages.js
View File

@ -17,9 +17,9 @@ erpnext.hub.BuyingMessages = class BuyingMessages extends SubPage {
this.get_item_details(item_code) this.get_item_details(item_code)
.then(item_details => { .then(item_details => {
this.item_details = item_details; this.item_details = item_details;
this.$message_container.find('.hub-section-header h4').text(this.item_details.item_name);
// make chat area // make chat area
this.$message_container.find('.hub-section-header h4').text(this.item_details.item_name);
this.$message_container.find('.hub-section-body').html(` this.$message_container.find('.hub-section-body').html(`
<div class="col-md-7 message-container"> <div class="col-md-7 message-container">
<div class="message-list"></div> <div class="message-list"></div>

15
erpnext/public/less/hub.less
View File

@ -137,8 +137,19 @@ body[data-route^="marketplace/"] {
} }
.hub-card-image { .hub-card-image {
min-width: 100%;
width: 100%; width: 100%;
height: 100%;
object-fit: contain;
}
.hub-recent-message {
padding: 10px;
.frappe-timestamp {
float: right;
}
div {
padding: 3px
}
} }
.hub-search-container { .hub-search-container {
@ -239,7 +250,7 @@ body[data-route^="marketplace/"] {
justify-content: space-between; justify-content: space-between;
margin-bottom: 20px; margin-bottom: 20px;
} }
.form-container { .form-container {
.frappe-control { .frappe-control {
max-width: 100% !important; max-width: 100% !important;