Merge branch 'develop' into gh-pages
* develop: add Scale add Scale add scale option add scale option
This commit is contained in:
commit
2d53109c1e
@ -1,9 +1,10 @@
|
||||
(function() {
|
||||
var global = {};
|
||||
global.version = "4.2.4";
|
||||
global.version = "4.2.6";
|
||||
global.issueTrackingUrl = "https://github.com/qoomon/Jira-Issue-Card-Printer";
|
||||
global.isDev = document.currentScript == null;
|
||||
global.isProd = !global.isDev;
|
||||
global.settings = {};
|
||||
|
||||
window.addEventListener("error", function(event) {
|
||||
var error = event.error;
|
||||
@ -24,14 +25,16 @@
|
||||
// wait untill all scripts loaded
|
||||
appendScript('https://qoomon.github.io/void', function() {
|
||||
init().then(function(){
|
||||
main();
|
||||
return main();
|
||||
}).catch(function(cause){
|
||||
console.log("ERROR " + JSON.stringify(cause,2,2));
|
||||
alert("Sorry somthing went wrong. Please create an issue at " + global.issueTrackingUrl);
|
||||
console.log("ERROR " + cause.stack);
|
||||
alert("Sorry somthing went wrong.\n\nPlease create an issue at " + global.issueTrackingUrl + "\n\n" + cause.stack);
|
||||
});
|
||||
});
|
||||
|
||||
function main() {
|
||||
var promises = [];
|
||||
|
||||
console.log("Run...")
|
||||
// determine application
|
||||
if (jQuery("meta[name='application-name'][ content='JIRA']").length > 0) {
|
||||
@ -62,8 +65,16 @@
|
||||
if (issueKeyList.length <= 0) {
|
||||
alert("Please select at least one issue.");
|
||||
return;
|
||||
} else if (issueKeyList.length > 100) {
|
||||
confirm("Are you sure you want select " + issueKeyList.length + " issues?");
|
||||
return;
|
||||
}
|
||||
|
||||
var settings = global.settings;
|
||||
settings.scale = readCookie("card_printer_font_scale",1);
|
||||
settings.rowCount = readCookie("card_printer_row_count",2);
|
||||
settings.colCount = readCookie("card_printer_column_count", 1);
|
||||
|
||||
// open print preview
|
||||
jQuery("body").append(printPreviewElement());
|
||||
jQuery("#card-print-overlay").prepend(printOverlayStyleElement());
|
||||
@ -77,24 +88,24 @@
|
||||
redrawCards();
|
||||
});
|
||||
|
||||
jQuery("#rowCount").val(readCookie("card_printer_row_count", 2));
|
||||
jQuery("#columnCount").val(readCookie("card_printer_column_count", 1));
|
||||
//jQuery("#font-scale-range").val(readCookie("card_printer_font_scale",1));
|
||||
jQuery("#font-scale-range").val(settings.scale);
|
||||
jQuery("#rowCount").val(settings.rowCount);
|
||||
jQuery("#columnCount").val(settings.colCount);
|
||||
|
||||
jQuery("#single-card-page-checkbox").attr('checked', readCookie("card_printer_single_card_page", 'true') == 'true');
|
||||
jQuery("#hide-description-checkbox").attr('checked', readCookie("card_printer_hide_description", 'false') == 'true');
|
||||
jQuery("#hide-assignee-checkbox").attr('checked', readCookie("card_printer_hide_assignee", 'true') == 'true');
|
||||
jQuery("#hide-due-date-checkbox").attr('checked', readCookie("card_printer_hide_due_date", 'false') == 'true');
|
||||
jQuery("#hide-status-checkbox").attr('checked', readCookie("card_printer_hide_status", 'true') == 'true');
|
||||
|
||||
jQuery("#card-print-dialog-title").text("Card Printer " + global.version + " - Loading issues...");
|
||||
renderCards(issueKeyList).then(function() {
|
||||
promises.push(renderCards(issueKeyList).then(function() {
|
||||
jQuery("#card-print-dialog-title").text("Card Printer " + global.version);
|
||||
//print();
|
||||
});
|
||||
}));
|
||||
|
||||
if (global.isProd) {
|
||||
ga('send', 'pageview');
|
||||
}
|
||||
return Promise.all(promises);
|
||||
}
|
||||
|
||||
function init() {
|
||||
@ -189,9 +200,7 @@
|
||||
});
|
||||
console.log("wait for resources loaded...");
|
||||
printDocument.close();
|
||||
}).catch(function(cause){
|
||||
console.log("ERROR " + JSON.stringify(cause))
|
||||
});;
|
||||
});
|
||||
}
|
||||
|
||||
function redrawCards() {
|
||||
@ -301,16 +310,6 @@
|
||||
jQuery("head", printDocument).append(style);
|
||||
}
|
||||
|
||||
// hide/show status
|
||||
jQuery("#styleHideStatus", printDocument).remove();
|
||||
if (!jQuery("#hide-status-checkbox")[0].checked) {
|
||||
var style = document.createElement('style');
|
||||
style.id = 'styleHideStatus';
|
||||
style.type = 'text/css';
|
||||
style.innerHTML = ".issue-status { display: none; }"
|
||||
jQuery("head", printDocument).append(style);
|
||||
}
|
||||
|
||||
// enable/disable single card page
|
||||
jQuery("#styleSingleCardPage", printDocument).remove();
|
||||
if (jQuery("#single-card-page-checkbox")[0].checked) {
|
||||
@ -327,16 +326,14 @@
|
||||
var printWindow = printFrame[0].contentWindow;
|
||||
var printDocument = printWindow.document;
|
||||
|
||||
var columnCount = jQuery("#columnCount").val();
|
||||
var rowCount = jQuery("#rowCount").val();
|
||||
|
||||
var cardCount = jQuery(".card", printDocument).length;
|
||||
var pageCount = Math.ceil(cardCount / (columnCount * rowCount))
|
||||
var scaleRoot = global.settings.scale;
|
||||
var rowCount = global.settings.rowCount;
|
||||
var columnCount = global.settings.colCount;
|
||||
|
||||
// scale
|
||||
|
||||
// reset scale
|
||||
jQuery("html", printDocument).css("font-size", "1cm");
|
||||
jQuery("html", printDocument).css("font-size", scaleRoot +"cm");
|
||||
jQuery("#styleColumnCount", printDocument).remove();
|
||||
jQuery("#styleRowCount", printDocument).remove();
|
||||
|
||||
@ -356,7 +353,7 @@
|
||||
// scale down
|
||||
var scale = Math.min(scaleWidth, scaleHeight, 1);
|
||||
if (scale < 1) {
|
||||
jQuery("html", printDocument).css("font-size", scale + "cm");
|
||||
jQuery("html", printDocument).css("font-size", ( scaleRoot * scale) + "cm");
|
||||
}
|
||||
|
||||
// size
|
||||
@ -455,24 +452,12 @@
|
||||
return true;
|
||||
});
|
||||
|
||||
// show status
|
||||
|
||||
result.find("#hide-status-checkbox").click(function() {
|
||||
writeCookie("card_printer_hide_status", this.checked);
|
||||
redrawCards();
|
||||
return true;
|
||||
});
|
||||
|
||||
// scale font
|
||||
|
||||
result.find("#font-scale-range").on("input", function() {
|
||||
writeCookie("card_printer_font_scale", jQuery(this).val());
|
||||
|
||||
var printFrame = result.find("#card-print-dialog-content-iframe");
|
||||
var printWindow = printFrame[0].contentWindow;
|
||||
var printDocument = printWindow.document;
|
||||
|
||||
jQuery("html", printDocument).css("font-size", jQuery(this).val() + "cm");
|
||||
global.settings.scale = jQuery(this).val();
|
||||
|
||||
redrawCards();
|
||||
});
|
||||
@ -481,6 +466,9 @@
|
||||
|
||||
result.find("#rowCount").on("input", function() {
|
||||
writeCookie("card_printer_row_count", jQuery(this).val());
|
||||
|
||||
global.settings.rowCount = jQuery(this).val();
|
||||
|
||||
redrawCards();
|
||||
});
|
||||
result.find("#rowCount").click(function() {
|
||||
@ -490,6 +478,9 @@
|
||||
|
||||
result.find("#columnCount").on("input", function() {
|
||||
writeCookie("card_printer_column_count", jQuery(this).val());
|
||||
|
||||
global.settings.colCount = jQuery(this).val();
|
||||
|
||||
redrawCards();
|
||||
});
|
||||
result.find("#columnCount").click(function() {
|
||||
@ -857,7 +848,7 @@
|
||||
if (/.*\/issues\/\?jql=.*/g.test(document.URL)) {
|
||||
var jql = document.URL.replace(/.*\?jql=(.*)/, '$1');
|
||||
var jqlIssues = [];
|
||||
var url = '/rest/api/2/search?jql=' + jql + "&maxResults=1000";
|
||||
var url = '/rest/api/2/search?jql=' + jql + "&maxResults=500&fields=key";
|
||||
console.log("IssueUrl: " + url);
|
||||
//console.log("Issue: " + issueKey + " Loading...");
|
||||
jQuery.ajax({
|
||||
@ -1017,11 +1008,7 @@
|
||||
issueData.url = window.location.origin + "/youtrack/issue/" + issueData.key;
|
||||
}));
|
||||
|
||||
return new Promise(function(resolve, reject) {
|
||||
Promise.all(promises)
|
||||
.then(function(){resolve(issueData);})
|
||||
.catch(function(cause){reject(cause);});
|
||||
});
|
||||
return Promise.all(promises).then(function(results){return issueData;});
|
||||
};
|
||||
|
||||
module.getIssueData = function(issueKey) {
|
||||
@ -1086,11 +1073,7 @@
|
||||
issueData.url = data.url;
|
||||
}));
|
||||
|
||||
return new Promise(function(resolve, reject) {
|
||||
Promise.all(promises)
|
||||
.then(function(){resolve(issueData);})
|
||||
.catch(function(cause){reject(cause);});
|
||||
});
|
||||
return Promise.all(promises).then(function(results){return issueData;});
|
||||
};
|
||||
|
||||
module.getIssueData = function(issueKey, callback, async) {
|
||||
@ -1141,11 +1124,7 @@
|
||||
issueData.url = data.shortUrl;
|
||||
}));
|
||||
|
||||
return new Promise(function(resolve, reject) {
|
||||
Promise.all(promises)
|
||||
.then(function(){resolve(issueData);})
|
||||
.catch(function(cause){reject(cause);});
|
||||
});
|
||||
return Promise.all(promises).then(function(results){return issueData;});
|
||||
};
|
||||
|
||||
module.getIssueData = function(issueKey, callback, async) {
|
||||
|
||||
18
card.css
18
card.css
@ -6,7 +6,7 @@ html {
|
||||
background: WHITE;
|
||||
padding: 0rem;
|
||||
margin: 0rem;
|
||||
font-size: 1.3cm;
|
||||
font-size: 1.0cm;
|
||||
overflow-y: scroll;
|
||||
}
|
||||
body {
|
||||
@ -23,8 +23,7 @@ body {
|
||||
border-radius: 0.25rem;
|
||||
}
|
||||
.badge {
|
||||
// WHITESMOKE, GAINSBOROM;
|
||||
background-color: #E0E0E0;
|
||||
background-color: WHITESMOKE;
|
||||
}
|
||||
.hidden {
|
||||
display: none;
|
||||
@ -53,17 +52,17 @@ body {
|
||||
.author {
|
||||
color: DIMGREY;
|
||||
position: absolute;
|
||||
top:0.35rem;
|
||||
top: 0.5rem;
|
||||
left: calc(50% - 2rem);
|
||||
font-size: 0.6rem;
|
||||
font-size: 0.8rem;
|
||||
overflow: visible;
|
||||
line-height: 0.38rem;
|
||||
}
|
||||
.author > span {
|
||||
.author > span:nth-of-type(2) {
|
||||
position: relative;
|
||||
left: 0.23rem;
|
||||
font-size: 0.6em;
|
||||
text-align: center;
|
||||
top: 0.0rem;
|
||||
left: 0.65rem;
|
||||
font-size: 0.5em;
|
||||
}
|
||||
.card {
|
||||
position: relative;
|
||||
@ -305,7 +304,6 @@ body {
|
||||
background-position: center;
|
||||
background-size: 65%;
|
||||
}
|
||||
|
||||
@media print {
|
||||
@page {
|
||||
margin: 0.0mm;
|
||||
|
||||
@ -25,7 +25,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="author">
|
||||
<span>©BengtBrodersen</span><br>
|
||||
qoomon.com
|
||||
<span>qoomon.com</span>
|
||||
<br>
|
||||
<span>©BengtBrodersen</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -13,14 +13,13 @@
|
||||
</div>
|
||||
<div id="card-print-dialog-footer">
|
||||
<div class="buttons">
|
||||
<label style="display:none; margin-right:10px"><input id="font-scale-range" type="range" min="0.4" max="1.6" step="0.1" value="1.0" />Font Scale</label>
|
||||
<label style="margin-right:10px;"><input id="rowCount" type="text" class="text" maxlength="1" style="width: 10px;" value="2"/>Row Count</label>
|
||||
<label style="margin-right:10px;"><input id="columnCount" type="text" class="text" maxlength="1" style="width: 10px;" value="1"/>Column Count</label>
|
||||
<label style="margin-right:10px; padding-right: 3px;"><input id="font-scale-range" type="range" min="0.5" max="2.0" step="0.01" style="width: 100px; position: relative; top: 2px; margin-right:5px;" value="1.0" />Scale</label>
|
||||
<label style="margin-right:0px;"><input id="rowCount" type="text" class="text" maxlength="1" style="width: 10px;" value="2"/>x</label>
|
||||
<label style="margin-right:10px;"><input id="columnCount" type="text" class="text" maxlength="1" style="width: 10px; margin-right:5px;" value="1"/>Page Grid</label>
|
||||
<label style="margin-right:10px"><input id="single-card-page-checkbox" type="checkbox"/>Single Card Per Page</label>
|
||||
<label style="margin-right:10px"><input id="hide-description-checkbox" type="checkbox"/>Hide Description</label>
|
||||
<label style="margin-right:10px"><input id="hide-assignee-checkbox" type="checkbox"/>Hide Assignee</label>
|
||||
<label style="margin-right:10px"><input id="hide-due-date-checkbox" type="checkbox"/>Hide Due Date</label>
|
||||
<label style="display:none; margin-right:10px"><input id="hide-status-checkbox" type="checkbox"/>Hide Status</label>
|
||||
<input id="card-print-dialog-print" type="button" class="aui-button aui-button-primary" value="Print" />
|
||||
<a id="card-print-dialog-cancel" title="Cancel" class="cancel">Cancel</a>
|
||||
</div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user