Skip to content

Commit

Permalink
Merge pull request #1706 from NextDom/develop
Browse files Browse the repository at this point in the history
0.7.0
  • Loading branch information
Sylvaner authored Mar 3, 2020
2 parents 6f5d5e7 + c8f5965 commit e86dd1c
Show file tree
Hide file tree
Showing 42 changed files with 200 additions and 167 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@ cache:
- $HOME/.composer/cache/files
- $HOME/.cache/pip
before_install:
- docker pull nextdom/nextdom-test:latest
- docker pull nextdom/nextdom-test2:latest
- mkdir -p tests/coverage
- composer require --dev symfony/panther:0.6.0 symfony/css-selector
- composer require --dev symfony/panther:0.6.1 symfony/css-selector
- wget -q -O phpunit https://phar.phpunit.de/phpunit-7.phar && chmod +x phpunit
- docker run -d --rm -v `pwd`:/data --name="nextdom-test" nextdom/nextdom-test:latest bash -x /start.sh
- docker run -d --rm -v `pwd`:/data --name="nextdom-test" nextdom/nextdom-test2:latest bash -x /start.sh
- sudo apt-get update && sudo apt-get install -y --no-install-recommends python3-pip python3-setuptools
- sudo python3 -m pip install --upgrade pip
- sudo pip3 install --ignore-installed pylint
- composer require --dev php-coveralls/php-coveralls
- while true; do DOCKER_LOGS=$(docker logs --tail 10 nextdom-test 2>&1); if [[ "$DOCKER_LOGS" =~ .*NEXTDOM.TEST.READY.* ]]; then break; fi; sleep 2; done
- docker exec -it nextdom-test service mysql stop
- docker commit nextdom-test nextdom-test-snap
- docker kill nextdom-test &
script:
Expand Down
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# NextDom Core Changelog
---
## 0.7

> ***Release Date : 25/02/2020***
>
> ***Statut : beta***
>
> ***Coverall : 23%***
#### FIXS
* [liste ici](https://github.com/NextDom/nextdom-core/milestone/28?closed=1)
---
## 0.6.8

> ***Release Date : 03/02/2020***
Expand Down
2 changes: 1 addition & 1 deletion assets/config/Nextdom_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.8
0.7.0
3 changes: 3 additions & 0 deletions assets/css/containers/_actionbars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,7 @@
box-shadow: rgba(0, 0, 0, .1) 0 1px 1px;
border-top-right-radius: 3px;
border-top-left-radius: 3px;
input {
display: inline-block;
}
}
7 changes: 4 additions & 3 deletions assets/css/pages/_modals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,6 @@
.btn:not(.btn-default):not(.btn-selector) {
color: $white !important;
}
a:not(.btn):not(.label-list) {
color: $nextdom_blue !important;
}
}
.ui-widget .label-config a,
.ui-widget .label-config i,
Expand All @@ -131,3 +128,7 @@
.modal-padding {
padding: 15px !important;
}
.ui-datepicker .ui-datepicker-today a {
background: none !important;
border: 1px dashed red !important;
}
26 changes: 24 additions & 2 deletions assets/css/themes/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,19 @@ html {
background-color: map_get($color_theme, 'color1') !important;
}

/* Modales */
.ui-widget-content {
a:not(.btn):not(.label-list):not(.ui-state-active):not(.ui-state-hover) {
color: map_get($color_theme, 'color1') !important;
}
}
.ui-datepicker td .ui-state-active,
.ui-datepicker td .ui-state-hover,
.ui-datepicker-close {
background: map_get($color_theme, 'color1') !important;
}


/* ################################################################################## */
/* COLOR2 = Couleur de contraste (icônes et texte sur fond accentué ou de sidebar...) */
/* ################################################################################## */
Expand Down Expand Up @@ -229,7 +242,8 @@ html {
}

/* Bouton action */
.btn-action {
.btn-action,
.label-action {
color: map_get($color_theme, 'color2') !important;
}

Expand Down Expand Up @@ -287,6 +301,13 @@ html {
color: map_get($color_theme, 'color2') !important;
}

/* Modales */
.ui-datepicker td .ui-state-active,
.ui-datepicker td .ui-state-hover,
.ui-datepicker-close {
color: map_get($color_theme, 'color2') !important;
}


/* ############################################################################################################# */
/* COLOR3 = Couleur de survol principale (contenu, titres, footer, bouton d'administration, unités, légendes...) */
Expand Down Expand Up @@ -891,7 +912,8 @@ pre:not(.mobile-pre) {
/* ########################## */
/* COLOR14 = Boutons d'action */
/* ########################## */
.btn-action {
.btn-action,
.label-action {
background-color: map_get($color_theme, 'color14') !important;
}
.tooltip-inner {
Expand Down
6 changes: 3 additions & 3 deletions assets/js/core/private.class.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ nextdom.private = {
return _data;
},
success: function (_data) {
console.log(_data);
// console.log(_data);
},
post_success: function (_data) {
},
complete: function () {
},
error: function (_data) {
// Erreur dans l'API ou mauvais retour AJAX (appel de ajax::error() côté PHP)
console.log(_data);
// console.log(_data);
}
},
/**
Expand Down Expand Up @@ -381,4 +381,4 @@ nextdom.private.ajaxCall = function(ajaxParams) {
else {
$.ajax(ajaxParams);
}
}
}
11 changes: 11 additions & 0 deletions assets/js/desktop/inits.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,17 @@ function initFields(){
$(":input").inputmask();
$(".slimScrollDiv").css("overflow", "");
$(".sidebar").css("overflow", "");
var options = $.extend(
{},
$.datepicker.regional["fr"],
{ showOtherMonths: true,
showWeek: true,
showButtonPanel: true,
numberOfMonths: 2,
firstDay: 1,
dateFormat: "yy-mm-dd" }
);
$.datepicker.setDefaults(options);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions assets/js/desktop/tools/scenario.js
Original file line number Diff line number Diff line change
Expand Up @@ -1350,9 +1350,9 @@ function addSchedule(scheduleCode) {
* @param scenario
*/
function addUsedBy(scenario,section) {
var usedByHtml = '<div class="form-group col-xs-6 col-xs-12 col-padding">';
var usedByHtml = '<div class="form-group col-xs-12 col-padding">';
usedByHtml += '<div class="mix-group">';
usedByHtml += '<span class="label label-default label-sticker">' + scenario.name + '</span>';
usedByHtml += '<span class="label label-action label-sticker">' + scenario.name + '</span>';
if (scenario.isActive == true) {
usedByHtml += '<span class="label label-success label-sticker-big badge">{{Actif}}</span>';
} else {
Expand Down
143 changes: 83 additions & 60 deletions assets/js/modals/cmd.history.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,92 @@
* along with NextDom. If not, see <http://www.gnu.org/licenses/>.
*/

$(".in_datepicker").datepicker({dateFormat: "yy-mm-dd"});
$('#ui-datepicker-div').hide();
// Page init
loadInformations();
initEvents();

$('#div_historyChart').css('height', $('#div_historyChart').closest('.ui-dialog-content').height()-$('#div_historyChart').closest('.ui-dialog-content').find('.content-header').height() - 15);
/**
* Load informations in all forms of the page
*/
function loadInformations() {
// Set charts size
$('#div_historyChart').css('height', $('#div_historyChart').closest('.ui-dialog-content').height()-$('#div_historyChart').closest('.ui-dialog-content').find('.content-header').height() - 15);
// Add the cmd chart
addChart(historyId);
// Init datepicker
$(".in_datepicker").datepicker();
setTimeout(function () {
$("#ui-datepicker-div").hide();
}, 200);
}

/**
* Init events on the profils page
*/
function initEvents() {
// Chart type change
$('#sel_chartType').on('change', function () {
addChart(historyId);
nextdom.cmd.save({
cmd: {id: historyId, display: {graphType: $(this).value()}},
error: function (error) {
notify("Erreur", error.message, 'error');
}
});
});

// Chart group change
$('#sel_groupingType').on('change', function () {
addChart(historyId);
nextdom.cmd.save({
cmd: {id: historyId, display: {groupingType: $(this).value()}},
error: function (error) {
notify("Erreur", error.message, 'error');
}
});
});

// Chart derive option change
$('#cb_derive').on('change', function () {
addChart(historyId);
nextdom.cmd.save({
cmd: {id: historyId, display: {graphDerive: $(this).value()}},
error: function (error) {
notify("Erreur", error.message, 'error');
}
});
});

delete nextdom.history.chart['div_historyChart'];
// Chart step option change
$('#cb_step').on('change', function () {
addChart(historyId);
nextdom.cmd.save({
cmd: {id: historyId, display: {graphStep: $(this).value()}},
error: function (error) {
notify("Erreur", error.message, 'error');
}
});
});

initHistoryTrigger();
addChart(historyId);
// Date change
$('#bt_validChangeDate').on('click', function () {
addChart(historyId);
nextdom.cmd.save({
cmd: {id: historyId},
error: function (error) {
notify("Erreur", error.message, 'error');
}
});
});
}

/**
* Add a charts
*/
function addChart(_cmd_id) {
// Hide alert
$('#alertGraph').hide();
// Delete old chart
if (isset(nextdom.history.chart['div_historyChart']) && isset(nextdom.history.chart['div_historyChart'].chart) && isset(nextdom.history.chart['div_historyChart'].chart.series)) {
$(nextdom.history.chart['div_historyChart'].chart.series).each(function(i, serie){
try {
Expand All @@ -52,6 +126,8 @@ function addChart(_cmd_id) {
}
});
}
delete nextdom.history.chart['div_historyChart'];
// Drawing
nextdom.cmd.save({
cmd: {id: historyId},
error: function (error) {
Expand Down Expand Up @@ -80,62 +156,9 @@ function addChart(_cmd_id) {
$('#cb_derive').off().value(init(data.cmd.display.graphDerive));
}
}
initHistoryTrigger();
initEvents();
}
});
}
});
}

function initHistoryTrigger() {
$('#sel_chartType').on('change', function () {
addChart(historyId);
nextdom.cmd.save({
cmd: {id: historyId, display: {graphType: $(this).value()}},
error: function (error) {
notify("Erreur", error.message, 'error');
}
});
});

$('#sel_groupingType').on('change', function () {
addChart(historyId);
nextdom.cmd.save({
cmd: {id: historyId, display: {groupingType: $(this).value()}},
error: function (error) {
notify("Erreur", error.message, 'error');
}
});
});

$('#cb_derive').on('change', function () {
addChart(historyId);
nextdom.cmd.save({
cmd: {id: historyId, display: {graphDerive: $(this).value()}},
error: function (error) {
notify("Erreur", error.message, 'error');
}
});
});

$('#cb_step').on('change', function () {
addChart(historyId);
nextdom.cmd.save({
cmd: {id: historyId, display: {graphStep: $(this).value()}},
error: function (error) {
notify("Erreur", error.message, 'error');
}
});
});
}

$('#bt_validChangeDate').on('click', function () {
delete nextdom.history.chart['div_historyChart'];
addChart(historyId);
nextdom.cmd.save({
cmd: {id: historyId},
error: function (error) {
notify("Erreur", error.message, 'error');
}
});
});
Empty file modified install/OS_specific/windows/pre_inst.sh
100755 → 100644
Empty file.
Empty file modified install/apache/nextdom-common
100755 → 100644
Empty file.
Empty file modified install/apache/nextdom-ssl.conf
100755 → 100644
Empty file.
Empty file modified install/apache/nextdom.conf
100755 → 100644
Empty file.
Empty file modified install/restore.php
100755 → 100644
Empty file.
1 change: 0 additions & 1 deletion log

This file was deleted.

41 changes: 0 additions & 41 deletions manifest.webmanifest

This file was deleted.

5 changes: 0 additions & 5 deletions phpunit.xml.dist

This file was deleted.

Loading

0 comments on commit e86dd1c

Please sign in to comment.