Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
rbbrioso28 committed Sep 24, 2021
2 parents 2bde5cf + af7bd9f commit 600bee7
Show file tree
Hide file tree
Showing 6 changed files with 226 additions and 113 deletions.
6 changes: 3 additions & 3 deletions config/app.interface.php
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@

// Concat plugins
'/MelisCore/js/pluginConcat/melis-core-concat-dataTables.js',
'/MelisCore/js/core/MelisDataTable.js',
'/MelisCore/js/core/melisDataTable.js',

// Concat plugins
'/MelisCore/js/pluginConcat/melis-core-concat-fancytree.js',
Expand Down Expand Up @@ -292,12 +292,12 @@

// lists of assets that will be loaded in the layout
'css' => [
'/MelisCore/build/css/bundle.css',
'/MelisCore/build/css/bundle.css?v=2021090801',

],
'js' => [
'/melis/get-translations',
'/MelisCore/build/js/bundle.js',
'/MelisCore/build/js/bundle.js?v=2021090801',
]
]
),
Expand Down
2 changes: 1 addition & 1 deletion public/build/js/bundle.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/js/core/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,13 +139,13 @@ var loader = (function(window) {
$loader = $melisTabEdition.find("#loader");

// checks for the inside iframes elements
if ( $iframeElements.length > 0 ) {
// if ( $iframeElements.length > 0 ) {
// remove loader
$loader.remove();

// remove overflow hidden
melisCoreTool.removeOverflowHidden();
}
// }

// set .melis-iframe css height
$melisIframe.css("height", melisIframeHeight);
Expand Down
41 changes: 33 additions & 8 deletions public/js/core/melisHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -1003,13 +1003,27 @@ var melisHelper = (function() {
{ responsivePriority: 1, targets: 0 },
{ responsivePriority: 2, targets: -1 },
],
language: melisDataTable.tableLanguage[langTrans],
language: window.melisDataTable.tableLanguage[langTrans],
};
// add ajax


//merge here the data config with the default settings
if (requiredSettings.hasOwnProperty("data")) {
if(Object.keys(requiredSettings.data).length > 0) {
settings = Object.assign(settings, requiredSettings.data);
}
}

var dataFunction = null;
if (requiredSettings.hasOwnProperty("dataFunction")) {
dataFunction = window[requiredSettings.dataFunction];
}

if (requiredSettings.hasOwnProperty("ajaxUrl")) {
settings.ajax = {
url: requiredSettings.ajaxUrl,
type: "POST",
data: dataFunction
};
}
// check for columns
Expand All @@ -1025,15 +1039,18 @@ var melisHelper = (function() {
});
settings.columnDefs.push({
width: item.css.width,
targets: ctr,
targets: ctr,
sClass: item.sClass
});

ctr++;
});
}
// set datatable columns
settings.columns = tmpColumns;
}
if (requiredSettings.hasOwnProperty("filters")) {

if (requiredSettings.hasOwnProperty("filters")) {
var preDefinedFilters = ["l", "f"];
var tableTop = '<"filter-bar"<"row"';
var leftDom = '<"fb-dt-left col-xs-12 col-md-4"';
Expand All @@ -1042,8 +1059,8 @@ var melisHelper = (function() {
var tableBottom = '<"bottom" t<"pagination-cont"rip>>';
var jsSdomContentInit = [];

// left filter area
if (Object.keys(requiredSettings.filters.left).length > 0) {
// left filter area
if (Object.keys(requiredSettings.filters.left).length > 0) {
// loop all left filters
$.each(requiredSettings.filters.left, function(index, item) {
// check for predefined datatble content
Expand Down Expand Up @@ -1107,8 +1124,15 @@ var melisHelper = (function() {
">>>" +
tableBottom;
}

//check if no filters set, sDom should not be displayed
if(Object.keys(requiredSettings.filters.left).length == 0 && Object.keys(requiredSettings.filters.center).length == 0
&& Object.keys(requiredSettings.filters.right).length == 0){
settings.sDom = "";
}

// add action buttons
if (requiredSettings.hasOwnProperty("actionButtons")) {
if(requiredSettings.hasOwnProperty("actionButtons")) {
// check if it has elements
if (Object.keys(requiredSettings.actionButtons).length > 0) {
settings.columns.push({
Expand All @@ -1123,7 +1147,7 @@ var melisHelper = (function() {
data: null,
width: "10%",
bSortable: false,
sClass: "dtActionCls",
sClass: "dtActionCls all",
mRender: function() {
return actionButtons;
},
Expand All @@ -1136,6 +1160,7 @@ var melisHelper = (function() {
.DataTable(settings)
.columns.adjust()
.responsive.recalc();

//run callback function for addtional filters
target.on("init.dt", function() {
// get all filter function
Expand Down
215 changes: 118 additions & 97 deletions public/plugins/js/MelisCoreDashboardBubbleUpdatesPlugin.js
Original file line number Diff line number Diff line change
@@ -1,115 +1,136 @@
var MelisCoreDashboardBubbleUpdatesPlugin = {
init: function() {
// initialize card
$('.melis-dashboard-bubble-updates-plugin[style=""]')
.addClass('flip-default')
.each(function(i){
var t = $(this);
setTimeout(function(){
t.css('visibility', 'visible').addClass('animated fadeInLeft');
}, (i+1)*300);
setTimeout(function(){
t.removeClass('flip-default fadeInLeft');
setTimeout(function(){
t.find('[class*="icon-"]').css('visibility', 'visible').addClass('animated fadeInDown');
}, (i+1)*200);
}, (i+1)*800);
});
init: function() {
// initialize card
$('.melis-dashboard-bubble-updates-plugin[style=""]')
.addClass("flip-default")
.each(function(i) {
var t = $(this);
setTimeout(function() {
t.css("visibility", "visible").addClass("animated fadeInLeft");
}, (i + 1) * 300);
setTimeout(function() {
t.removeClass("flip-default fadeInLeft");
setTimeout(function() {
t.find('[class*="icon-"]')
.css("visibility", "visible")
.addClass("animated fadeInDown");
}, (i + 1) * 200);
}, (i + 1) * 800);
});

this.getUpdates();
},
getUpdates: function() {
$.ajax({
type: 'POST',
url: 'melis/dashboard-plugin/MelisCoreDashboardBubbleUpdatesPlugin/getUpdates',
}).done(function (response) {
// plugin front text
var text = translations.tr_meliscore_dashboard_bubble_plugins_update;
this.getUpdates();
},
getUpdates: function() {
$.ajax({
type: "POST",
url:
"/melis/dashboard-plugin/MelisCoreDashboardBubbleUpdatesPlugin/getUpdates",
}).done(function(response) {
// plugin front text
var text = translations.tr_meliscore_dashboard_bubble_plugins_update;

if (response.count > 1) {
text = translations.tr_meliscore_dashboard_bubble_plugins_updates;
}
if (response.count > 1) {
text = translations.tr_meliscore_dashboard_bubble_plugins_updates;
}

$('.dashboard-bubble-updates-text').empty();
$('.dashboard-bubble-updates-text').text(text);
$(".dashboard-bubble-updates-text").empty();
$(".dashboard-bubble-updates-text").text(text);

// plugin front button text
if (response.count > 0) {
var buttonText = translations.tr_meliscore_dashboard_bubble_plugins_view_update;
// plugin front button text
if (response.count > 0) {
var buttonText =
translations.tr_meliscore_dashboard_bubble_plugins_view_update;

if (response.count > 1) {
buttonText = translations.tr_meliscore_dashboard_bubble_plugins_view_updates;
}
if (response.count > 1) {
buttonText =
translations.tr_meliscore_dashboard_bubble_plugins_view_updates;
}

var button = '<button id="dashboard-bubble-updates-back-btn" class="btn btn-default">' + buttonText + '</button>';
$('.dashboard-bubble-updates-back-btn-container').each(function(){
$(this).empty();
$(this).append(button);
});
} else {
$('.dashboard-bubble-updates-back-btn-container').each(function(){
$(this).empty();
});
}
var button =
'<button id="dashboard-bubble-updates-back-btn" class="btn btn-default">' +
buttonText +
"</button>";
$(".dashboard-bubble-updates-back-btn-container").each(function() {
$(this).empty();
$(this).append(button);
});
} else {
$(".dashboard-bubble-updates-back-btn-container").each(function() {
$(this).empty();
});
}

// plugin front counter
$('.dashboard-bubble-updates-counter').each(function(){
$(this).text(response.count);
});
// plugin front counter
$(".dashboard-bubble-updates-counter").each(function() {
$(this).text(response.count);
});

// plugin back content/list
$.each(response.data, function (key, value) {
if (value.status === -1) {
var update = '<tr class="dashboard-bubble-update-details" data-packageid="' + value.packageId + '" data-packagename="' + value.module_name +'">\n' +
'<td class="center">' + value.module_name + '</td>\n' +
'<td class="center">' + value.currentVersion + '</td>\n' +
'<td class="center">' + value.latestVersion + '</td>\n' +
'</tr>';
// plugin back content/list
$.each(response.data, function(key, value) {
if (value.status === -1) {
var update =
'<tr class="dashboard-bubble-update-details" data-packageid="' +
value.packageId +
'" data-packagename="' +
value.module_name +
'">\n' +
'<td class="center">' +
value.module_name +
"</td>\n" +
'<td class="center">' +
value.currentVersion +
"</td>\n" +
'<td class="center">' +
value.latestVersion +
"</td>\n" +
"</tr>";

$('.dashboard-bubble-updates-list').each(function(){
$(this).append(update);
});
}
})
});
},
$(".dashboard-bubble-updates-list").each(function() {
$(this).append(update);
});
}
});
});
},
};

$(document).ready(function() {
var $body = $('body');
var showBubblePlugins = MelisCoreDashboardBubblePlugin.showBubblePlugins();
var $body = $("body");
var showBubblePlugins = MelisCoreDashboardBubblePlugin.showBubblePlugins();

if (showBubblePlugins) {
MelisCoreDashboardBubbleUpdatesPlugin.init();
}
if (showBubblePlugins) {
MelisCoreDashboardBubbleUpdatesPlugin.init();
}

$body.on('click', '.dashboard-bubble-update-details', function () {
var packageId = $(this).data('packageid');
var packageTitle = $(this).data('packagename');
$body.on("click", ".dashboard-bubble-update-details", function() {
var packageId = $(this).data("packageid");
var packageTitle = $(this).data("packagename");

melisHelper.tabOpen(
translations.tr_market_place,
"fa-shopping-cart",
"id_melis_market_place_tool_display",
"melis_market_place_tool_display"
);
melisHelper.tabOpen(
translations.tr_market_place,
"fa-shopping-cart",
"id_melis_market_place_tool_display",
"melis_market_place_tool_display"
);

var alreadyOpen = $("body #melis-id-nav-bar-tabs li a.tab-element[data-id='id_melis_market_place_tool_display']");
var checkTab = setInterval(function() {
if (alreadyOpen.length) {
melisHelper.tabOpen(
packageTitle,
'fa-shopping-cart',
packageId + '_id_melis_market_place_tool_package_display',
'melis_market_place_tool_package_display',
{
packageId: packageId
},
'id_melis_market_place_tool_display'
);
var alreadyOpen = $(
"body #melis-id-nav-bar-tabs li a.tab-element[data-id='id_melis_market_place_tool_display']"
);
var checkTab = setInterval(function() {
if (alreadyOpen.length) {
melisHelper.tabOpen(
packageTitle,
"fa-shopping-cart",
packageId + "_id_melis_market_place_tool_package_display",
"melis_market_place_tool_package_display",
{
packageId: packageId,
},
"id_melis_market_place_tool_display"
);

clearInterval(checkTab);
}
}, 500);
});
});
clearInterval(checkTab);
}
}, 500);
});
});

0 comments on commit 600bee7

Please sign in to comment.