most of #273 done

This commit is contained in:
tidusjar 2016-06-07 14:26:54 +01:00
commit 4808fffcef
15 changed files with 453 additions and 103 deletions

View file

@ -17,9 +17,6 @@ initLoad();
$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
var target = $(e.target).attr('href');
if (target === "#inProgressTab") {
loadInProgressIssues();
}
if (target === "#resolvedTab") {
loadResolvedIssues();
}
@ -117,10 +114,12 @@ $('#myModal').on('show.bs.modal', function (event) {
var button = $(event.relatedTarget); // Button that triggered the modal
var id = button.data('identifier'); // Extract info from data-* attributes
var modal = $(this);
modal.find('.theSaveButton').val(id); // Add ID to the button
var requestField = modal.find('input');
requestField.val(id); // Add ID to the hidden field
requestField.val(id); // Add ID to the hidden field
});
// Update the note modal
@ -194,7 +193,7 @@ function initLoad() {
}
function loadCounts() {
var url = createBaseUrl(base, "issues/tabCount");
var url = createBaseUrl(base, "/issues/tabCount");
$.ajax({
type: "get",
url: url,
@ -226,13 +225,6 @@ function loadPendingIssues() {
loadIssues("pending", $('#pendingIssues'));
}
function loadInProgressIssues() {
var $element = $('#inprogressIssues');
$element.html("");
loadIssues("inprogress", $element);
}
function loadResolvedIssues() {
var $element = $('#resolvedIssues');
$element.html("");
@ -240,8 +232,8 @@ function loadResolvedIssues() {
}
function loadIssues(type, element) {
var url = createBaseUrl(base, "issues/" + type);
var linkUrl = createBaseUrl(base, "issues/");
var url = createBaseUrl(base, "/issues/" + type);
var linkUrl = createBaseUrl(base, "/issues/");
$.ajax({
type: "get",
url: url,
@ -272,7 +264,7 @@ function buildIssueContext(result) {
requestId: result.requestId,
type: result.type,
title: result.title,
count: result.count
issues: result.issues
};
return context;

View file

@ -184,6 +184,78 @@ $(function () {
});
});
// Report Issue
$(document).on("click", ".dropdownIssue", function (e) {
var issue = $(this).attr("issue-select");
var id = e.target.id;
// Other issue so the modal is opening
if (issue == 4) {
return;
}
e.preventDefault();
var $form = $('#report' + id);
var data = $form.serialize();
data = data + "&issue=" + issue;
$.ajax({
type: $form.prop('method'),
url: $form.prop('action'),
data: data,
dataType: "json",
success: function (response) {
if (checkJsonResponse(response)) {
generateNotify("Successfully Reported Issue.", "success");
}
},
error: function (e) {
console.log(e);
generateNotify("Something went wrong!", "danger");
}
});
});
// Save Modal click
$(".theSaveButton").click(function (e) {
var comment = $("#commentArea").val();
e.preventDefault();
var $form = $("#commentForm");
var data = $form.serialize();
data = data + "&comment=" + comment;
$.ajax({
type: $form.prop("method"),
url: $form.prop("action"),
data: data,
dataType: "json",
success: function (response) {
if (checkJsonResponse(response)) {
generateNotify("Success! Added Issue.", "success");
$("#myModal").modal("hide");
}
},
error: function (e) {
console.log(e);
generateNotify("Something went wrong!", "danger");
}
});
});
// Update the modal
$('#issuesModal').on('show.bs.modal', function (event) {
var button = $(event.relatedTarget); // Button that triggered the modal
var id = button.data('identifier'); // Extract info from data-* attributes
var type = button.data('type'); // Extract info from data-* attributes
var modal = $(this);
modal.find('.theSaveButton').val(id); // Add ID to the button
$('#providerIdModal').val(id);
$('#typeModal').val(type);
});
function focusSearch($content) {
if ($content.length > 0) {
$('input[type=text].form-control', $content).first().focus();