baimard · baimard · Feb 12, 2022 · Jan 22, 2022 · Jan 22, 2022 · Jan 26, 2022
diff --git a/Makefile b/Makefile
@@ -153,7 +153,7 @@ appstore:
 
 .PHONY: test
 test:
- $(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.xml --debug --colors
+ sudo -u www-data $(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.xml --debug --colors
 #$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
 
 .PHONY: testPanther
@@ -177,4 +177,19 @@ composer.phar:
 
 cleanComposer:
  rm -f translationtool.phar composer.lock src/composer.lock
- rm -rf vendor src/vendor
+ rm -rf vendor src/vendor
+
+fulltest: runContainer testPanther test stopContainer
+
+runContainer:
+ sudo service apache2 stop
+ docker run -d --rm --network next --name database -p 3306:3306 -e MYSQL_DATABASE=nextcloud -e MARIADB_ROOT_PASSWORD=nextcloud -e MYSQL_USER=nextcloud -e MYSQL_PASSWORD=nextcloud mariadb
+ docker run -d --rm --network next --name nextcloud -p 80:80 nextcloud:23-apache
+ sleep 5
+ killall geckodriver; php tests/Unit/Panther/initTest.php
+ docker exec -i database sh -c 'exec mysql -uroot -p"$$MARIADB_ROOT_PASSWORD"' < ./tests/dataset.sql
+
+stopContainer:
+ docker stop -t 0 database
+ docker stop -t 0 nextcloud
+ sudo service apache2 start
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -40,7 +40,7 @@
 
  [Love my work ? Buy me a coffee !](https://www.buymeacoffee.com/benjaminaimard)
  </description>
- <version>2.0.2</version>
+ <version>2.0.4</version>
  <licence>agpl</licence>
  <author mail="benjamin@cybercorp.fr" homepage="https://github.com/baimard">Benjamin AIMARD</author>
  <namespace>Gestion</namespace>

diff --git a/js/820.app.js b/js/820.app.js
diff --git a/js/820.devisShow.app.js b/js/820.devisShow.app.js
diff --git a/js/820.factureShow.app.js b/js/820.factureShow.app.js
diff --git a/js/856.app.js b/js/856.app.js
diff --git a/js/856.devisShow.app.js b/js/856.devisShow.app.js
diff --git a/js/856.factureShow.app.js b/js/856.factureShow.app.js
diff --git a/js/client.app.js b/js/client.app.js
diff --git a/js/configuration.app.js b/js/configuration.app.js
diff --git a/js/devis.app.js b/js/devis.app.js
diff --git a/js/devisShow.app.js b/js/devisShow.app.js
diff --git a/js/facture.app.js b/js/facture.app.js
diff --git a/js/factureShow.app.js b/js/factureShow.app.js
diff --git a/js/main.app.js b/js/main.app.js
diff --git a/js/produit.app.js b/js/produit.app.js
diff --git a/js/statistique.app.js b/js/statistique.app.js
diff --git a/lib/Db/Bdd.php b/lib/Db/Bdd.php
@@ -100,7 +100,7 @@ public function insertClient($idNextcloud){
  * Insert quote
  */
  public function insertDevis($idNextcloud){
- $sql = "INSERT INTO `".$this->tableprefix."devis` (`id`, `date`,`id_nextcloud`,`num`,`id_client`,version,mentions,comment) VALUES (NULL, NOW(),?,?,0,'0.1',?,?);";
+ $sql = "INSERT INTO `".$this->tableprefix."devis` (`date`,`id_nextcloud`,`num`,`id_client`,version,mentions,comment) VALUES (NOW(),?,?,0,'0.1',?,?);";
  $this->execSQLNoData($sql, array($idNextcloud,$this->l->t('Quote number'),$this->l->t('New'),$this->l->t('Comment')));
  return true;
  }
@@ -109,7 +109,7 @@ public function insertDevis($idNextcloud){
  * Insert invoice
  */
  public function insertFacture($idNextcloud){
- $sql = "INSERT INTO `".$this->tableprefix."facture` (`id`, `date`,`id_nextcloud`,`num`,`date_paiement`,`type_paiement`,`id_devis`) VALUES (NULL,?,?,?,NOW(),?,0);";
+ $sql = "INSERT INTO `".$this->tableprefix."facture` (`date`,`id_nextcloud`,`num`,`date_paiement`,`type_paiement`,`id_devis`) VALUES (?,?,?,NOW(),?,0);";
  $this->execSQLNoData($sql, array($this->l->t('Text free'),$idNextcloud,$this->l->t('Invoice number'),$this->l->t('Means of payment')));
 
  if(json_decode($this->getConfiguration(($idNextcloud)))[0]->auto_invoice_number == 1){
@@ -169,7 +169,7 @@ public function checkConfig($idNextcloud){
  $sql = "SELECT count(*) as res FROM `".$this->tableprefix."configuration` WHERE `id_nextcloud` = ?";
  $res = json_decode($this->execSQL($sql, array($idNextcloud)))[0]->res;
  if ( $res < 1 ){
- $sql = "INSERT INTO `".$this->tableprefix."configuration` (`id`, `entreprise`, `nom`, `prenom`, `legal_one`, `legal_two`, `mail`, `telephone`, `adresse`, `path`, `id_nextcloud`,`mentions_default`,`tva_default`,`devise`) VALUES (NULL, ?, ?, ?, ?, ?, ?, ?, ?, '/', ?, ?, '0',?);";
+ $sql = "INSERT INTO `".$this->tableprefix."configuration` (`entreprise`, `nom`, `prenom`, `legal_one`, `legal_two`, `mail`, `telephone`, `adresse`, `path`, `id_nextcloud`,`mentions_default`,`tva_default`,`devise`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, '/', ?, ?, '0',?);";
  $this->execSQLNoData($sql, array($this->l->t('Your company name'),
  $this->l->t('Your company contact surname'),
  $this->l->t('Your company contact name'),
@@ -242,15 +242,15 @@ public function numberProduit($idNextcloud){
  * Annual turnover per month without VAT
  */
  public function getAnnualTurnoverPerMonthNoVat($idNextcloud){
- $sql = "SELECT YEAR(oc_gestion_facture.date_paiement) as y, 
- MONTH(oc_gestion_facture.date_paiement) as m, 
- sum(oc_gestion_produit.prix_unitaire * oc_gestion_produit_devis.quantite) as total
- FROM `oc_gestion_facture`, `oc_gestion_produit_devis`, `oc_gestion_produit`
- WHERE oc_gestion_facture.id_devis = oc_gestion_produit_devis.devis_id
- AND oc_gestion_produit_devis.produit_id = oc_gestion_produit.id
- AND oc_gestion_facture.id_nextcloud = ?
- GROUP BY YEAR(oc_gestion_facture.date_paiement), MONTH(oc_gestion_facture.date_paiement)
- ORDER BY YEAR(oc_gestion_facture.date_paiement) DESC, MONTH(oc_gestion_facture.date_paiement);";
+ $sql = "SELECT YEAR(".$this->tableprefix."facture.date_paiement) as y, 
+ MONTH(".$this->tableprefix."facture.date_paiement) as m, 
+ sum(".$this->tableprefix."produit.prix_unitaire * ".$this->tableprefix."produit_devis.quantite) as total
+ FROM `".$this->tableprefix."facture`, `".$this->tableprefix."produit_devis`, `".$this->tableprefix."produit`
+ WHERE ".$this->tableprefix."facture.id_devis = ".$this->tableprefix."produit_devis.devis_id
+ AND ".$this->tableprefix."produit_devis.produit_id = ".$this->tableprefix."produit.id
+ AND ".$this->tableprefix."facture.id_nextcloud = ?
+ GROUP BY YEAR(".$this->tableprefix."facture.date_paiement), MONTH(".$this->tableprefix."facture.date_paiement)
+ ORDER BY YEAR(".$this->tableprefix."facture.date_paiement) DESC, MONTH(".$this->tableprefix."facture.date_paiement);";
  return $this->execSQL($sql, array($idNextcloud));
  }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/js/client.js b/src/js/client.js
@@ -2,16 +2,15 @@ import '@nextcloud/dialogs/styles/toast.scss'
 import 'datatables.net-dt/css/jquery.dataTables.css';
 import '../css/mycss.less';
 
-
 import DataTable from 'datatables.net';
-import { globalConfiguration, optionDatatable, path } from "./modules/mainFunction.mjs";
+import { globalConfiguration, optionDatatable } from "./modules/mainFunction.mjs";
 import './listener/main_listener';
 import { Client } from "./objects/client.mjs";
-// import 'bootstrap/js/dist/util';
 
 
 window.addEventListener('DOMContentLoaded', function () {
  globalConfiguration();
  Client.loadClientDT(new DataTable('.tabledt',optionDatatable));
+
 });
 
diff --git a/src/js/modules/mainFunction.mjs b/src/js/modules/mainFunction.mjs
@@ -2,7 +2,7 @@ import { showSuccess } from "@nextcloud/dialogs";
 import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 import { configuration, getStats, isconfig } from "./ajaxRequest.mjs";
 
-import { generateUrl, getRootUrl } from "@nextcloud/router";
+import { generateUrl } from "@nextcloud/router";
 import { Devis } from "../objects/devis.mjs";
 import { Client } from "../objects/client.mjs";
 
@@ -12,7 +12,7 @@ export var cur = null;
 /**
  * 
  */
- export const optionDatatable = {
+ export var optionDatatable = {
  autoWidth: false,
  stateSave: true,
  language: {
@@ -88,7 +88,7 @@ export function LoadDT(DT, response, cls) {
  let c = new cls(myresp);
  DT.row.add(c.getDTRow());
  });
- DT.columns.adjust().draw();
+ DT.columns.adjust(optionDatatable).draw(true);
  configureDT();
 }
 

diff --git a/templates/content/changelog.php b/templates/content/changelog.php
@@ -1,7 +1,7 @@
 <div syle="display: none;" id="modalConfig" class="modal">
  <div class="modal-content">
  <span class="modalClose">&times;</span>
- <h2><?php p($l->t('Welcome to GESTION 2.0.2 ')); ?></h2>
+ <h2><?php p($l->t('Welcome to GESTION')); ?> 2.0.4</h2>
  <p style="margin-bottom:20px;"><b><?php p($l->t('To start with this application you need to configure your company information, follow this link')); ?></b> &#128073; <a href="<?php echo ($_['url']['config']); ?>"><?php p($l->t('My company')); ?></a></p>
  <p style="margin-bottom:20px;">&#9888; <u><?php p($l->t('If you have updated this application, do not forget to clear your cache')); ?></u> &#9888;</p>
  <p style="margin-bottom:20px;"><?php p($l->t('This application is open source and is designed by Benjamin AIMARD.')); ?></p>

diff --git a/tests/Unit/Controller/PageControllerTest.php b/tests/Unit/Controller/PageControllerTest.php
@@ -230,4 +230,9 @@ public function testGetStats(){
  $this->assertArrayHasKey('facture', $result);
  $this->assertArrayHasKey('produit', $result);
  }
+
+ public function testGetAnnualTurnoverPerMonthNoVat(){
+ $result = (array) json_decode($this->controller->getAnnualTurnoverPerMonthNoVat());
+ $this->assertIsArray($result);
+ }
 }
diff --git a/tests/Unit/Panther/IhmTest.php b/tests/Unit/Panther/IhmTest.php
@@ -7,8 +7,8 @@
 
 $client->request('GET', 'http://next.cybercorp.fr');
 $client->submitForm('submit-form', [
- 'user' => 'baimard',
- 'password' => 'baimardbaimard' // Not my real pass ...
+ 'user' => 'nextcloud',
+ 'password' => 'nextcloud' // Not my real pass ...
 ]);
 
 $client->request('GET', 'http://next.cybercorp.fr/index.php/apps/gestion/config');

diff --git a/tests/Unit/Panther/initTest.php b/tests/Unit/Panther/initTest.php
@@ -0,0 +1,34 @@
+<?php
+
+use Symfony\Component\Panther\Client;
+require __DIR__.'/../../../vendor/autoload.php';
+
+$client = Client::createFirefoxClient();
+
+$client->request('GET', 'http://next.cybercorp.fr');
+
+$client->executeScript("document.getElementById('showAdvanced').click()");
+$client->waitForVisibility('#mysql');
+$client->executeScript("document.getElementById('mysql').click()");
+
+$client->submitForm('Terminer l\'installation', [
+ 'adminlogin' => 'nextcloud',
+ 'adminpass' => 'nextcloud',
+ 'dbuser' => 'root',
+ 'dbpass' => 'nextcloud',
+ 'dbname' => 'nextcloud',
+ 'dbhost' => 'database',
+ 'dbtype' => 'mysql'
+]);
+
+$client = Client::createFirefoxClient();
+
+$client->request('GET', 'http://next.cybercorp.fr/login');
+$client->submitForm('submit-form', [
+ 'user' => 'nextcloud',
+ 'password' => 'nextcloud'
+]);
+sleep(5);
+$client->executeScript("document.getElementById('firstrunwizard').getElementsByClassName('icon-close')[0].click()");
+$client->request('GET', 'http://next.cybercorp.fr/settings/apps/organization');
+$client->executeScript("var els = document.getElementsByClassName('app-name');for(var i = 0; i < els.length; i++){if(els[i].innerHTML.indexOf('Gestion') > -1){els[i].parentNode.getElementsByClassName('enable')[0].click()}}");
diff --git a/tests/Unit/Panther/screens/about.png b/tests/Unit/Panther/screens/about.png
diff --git a/tests/Unit/Panther/screens/config.png b/tests/Unit/Panther/screens/config.png
diff --git a/tests/Unit/Panther/screens/devis.png b/tests/Unit/Panther/screens/devis.png
diff --git a/tests/Unit/Panther/screens/facture.png b/tests/Unit/Panther/screens/facture.png
diff --git a/tests/Unit/Panther/screens/index.png b/tests/Unit/Panther/screens/index.png
diff --git a/tests/Unit/Panther/screens/produit.png b/tests/Unit/Panther/screens/produit.png
diff --git a/tests/Unit/Panther/screens/selectFolder.png b/tests/Unit/Panther/screens/selectFolder.png
diff --git a/tests/Unit/Panther/screens/statistique.png b/tests/Unit/Panther/screens/statistique.png