Skip to content

Commit

Permalink
Changed Layout; Creation Status is now always visible
Browse files Browse the repository at this point in the history
  • Loading branch information
De Groof committed Mar 20, 2019
1 parent 290fdde commit 79e0347
Show file tree
Hide file tree
Showing 6 changed files with 356 additions and 313 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ package-lock.json
*Bundle.js
jbe-build-wrapper.xml
.jazzignore
deployment-properties.ini
deployment-properties.ini
.idea
42 changes: 23 additions & 19 deletions resources/ui/HistoryEntry.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,41 @@
* @Copyright (c) 2017, Siemens AG
*/
define([
"dojo/_base/declare",
"dijit/_WidgetBase",
"dijit/_TemplatedMixin",
"dojo/_base/declare",
"dijit/_WidgetBase",
"dijit/_TemplatedMixin",
"dijit/_WidgetsInTemplateMixin",
"dijit/Tooltip",
"dojo/dom-construct",
"dojo/text!./templates/HistoryEntry.html"
], function(declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, Tooltip, domConstruct, template) {
return declare("com.siemens.bt.jazz.rtc.workItemEditor.presentation.statusHistory.ui.HistoryEntry", [ _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {
], function (declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, Tooltip, domConstruct, template) {
return declare("com.siemens.bt.jazz.rtc.workItemEditor.presentation.statusHistory.ui.HistoryEntry", [_WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin], {

templateString: null,
stateData: null,
constructor: function(stateData) {

constructor: function (stateData) {
this.templateString = template;
this.stateData = stateData;
},

postCreate: function() {
if(this.stateData.resolution) {
var data = "<td><img src=\""+ this.stateData.resolutionIcon+ "\"></img></td>"
+ "<td>" + this.stateData.resolution + "</td>";
postCreate: function () {
if (this.stateData.resolution) {
var data = "<td><img src=\"" + this.stateData.resolutionIcon + "\"></img></td>"
+ "<td>" + this.stateData.resolution + "</td>";
domConstruct.place(data, this.resolutionRow);
}
if (this.stateData.daysSince) {
var days = "<td></td><td>"+this.stateData.daysSince + " days ago</td>";
domConstruct.place(days, this.daysAgoRow);
}
},

startup: function() {
startup: function () {
this.addTooltips();
},

addTooltips: function() {
addTooltips: function () {
new Tooltip({
connectId: [this.userImageTooltip],
label: "<b>" + this.stateData.primaryText + "</b>",
Expand All @@ -44,17 +48,17 @@ define([
label: "Starting " + this.formattedDate + ", this work item was in the state " + this.stateData.stateName + " for <b>" + this.stateData.dateDiff + " days</b>",
position: ["before", "after"]
});
if(this.stateDelegate !== null) {
if (this.stateDelegate !== null) {
new Tooltip({
connectId: [this.delegatedHistoryEntry],
label: "<span class=\"delegatedHistoryEntry\">"
+ "<img class=\"userImage\" src=\"" + this.userImage + "\"></img>"
+ "<p>" + this.stateData.modifier + "<br> changed on " + this.formattedDate + "</p>"
+ this.stateDelegate
+ "<img class=\"userImage\" src=\"" + this.userImage + "\"></img>"
+ "<p>" + this.stateData.modifier + "<br> " + this.stateData.changedOn + " " + this.formattedDate + "</p>"
+ this.stateDelegate
+ "</span>",
position: ["before", "after"]
});
}
}
});
});
});
Loading

0 comments on commit 79e0347

Please sign in to comment.