SliTaz Repositories

     1.1 --- a/tazwikiss/rootfs/var/www/wiki/pages/AideCalc.txt	Sat Feb 21 11:57:51 2015 +0100
     1.2 +++ b/tazwikiss/rootfs/var/www/wiki/pages/AideCalc.txt	Sat Feb 21 13:58:12 2015 +0100
     1.3 @@ -16,10 +16,10 @@
     1.4  !!Exemples
     1.5  {{Pommes;12;=round((100*B1)/B3)+'%'; 
     1.6  Poires;7;=round((100*B2)/B3)+"%"; 
     1.7 -Total :;=B1+B2;=parseInt(C1)+parseInt(C2)+'%';}}
     1.8 +Total :;=sum("B1","B2");=parseInt(C1)+parseInt(C2)+'%';}}
     1.9  Pommes;12;=round((100*B1)/B3)+'%';
    1.10  Poires;7;=round((100*B2)/B3)+"%";
    1.11 -Total :;=B1+B2;=parseInt(C1)+parseInt(C2)+'%';
    1.12 +Total :;=sum("B1","B2");=parseInt(C1)+parseInt(C2)+'%';
    1.13  {{Un nombre;sa racine carré; 
    1.14  2;=(A2<0)?alert('A2 < 0 !'):sqrt(A2);}}
    1.15  Un nombre;sa racine carré;

     2.1 --- a/tazwikiss/rootfs/var/www/wiki/pages/HelpCalc.txt	Sat Feb 21 11:57:51 2015 +0100
     2.2 +++ b/tazwikiss/rootfs/var/www/wiki/pages/HelpCalc.txt	Sat Feb 21 13:58:12 2015 +0100
     2.3 @@ -16,10 +16,10 @@
     2.4  !!Examples
     2.5  {{Apples;12;=round((100*B1)/B3)+'%'; 
     2.6  Pears;7;=round((100*B2)/B3)+"%"; 
     2.7 -Total :;=B1+B2;=parseInt(C1)+parseInt(C2)+'%';}}
     2.8 +Total :;=sum("B1","B2");=parseInt(C1)+parseInt(C2)+'%';}}
     2.9  Apples;12;=round((100*B1)/B3)+'%';
    2.10  Pears;7;=round((100*B2)/B3)+"%";
    2.11 -Total :;=B1+B2;=parseInt(C1)+parseInt(C2)+'%';
    2.12 +Total :;=sum("B1","B2");=parseInt(C1)+parseInt(C2)+'%';
    2.13  {{A number;its square root; 
    2.14  2;=(A2<0)?alert('A2 < 0 !'):sqrt(A2);}}
    2.15  A number;its square root;

     3.1 --- a/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.sh	Sat Feb 21 11:57:51 2015 +0100
     3.2 +++ b/tazwikiss/rootfs/var/www/wiki/plugins/wkp_Calc.sh	Sat Feb 21 13:58:12 2015 +0100
     3.3 @@ -22,6 +22,18 @@
     3.4  }
     3.5  
     3.6  var DATA={};
     3.7 +function sum(id,from,to) {
     3.8 +    var result=0
     3.9 +    for (var l=from.charCodeAt(0);;l++) {
    3.10 +        for (var n=parseInt(from.substring(1));
    3.11 +        	 n <= parseInt(to.substring(1));n++) {
    3.12 +            var e=document.getElementById(id+String.fromCharCode(l)+n)
    3.13 +            result+=parseFloat(e.value)
    3.14 +        }
    3.15 +        if (l == to.charCodeAt(0)) break
    3.16 +    }
    3.17 +    return result;
    3.18 +}
    3.19  function buildCalc(id, rows, cols) {
    3.20      DATA[id] = {};
    3.21      var maths = [ "abs", "acos", "asin", "atan", "atan2", "ceil", "cos", "exp",
    3.22 @@ -37,6 +49,7 @@
    3.23  	function(n){var x=1;while(n>1)x*=n--;return x;};
    3.24      DATA[id].fib  = DATA[id].FIB  = 
    3.25  	function(n){var c=0,p=1;while(n-->0){var x=c;c+=p;p=x};return c;};
    3.26 +    DATA[id].sum  = DATA[id].SUM  = function(a,b){return sum(id,a,b);};
    3.27      for (var i=0; i<=rows; i++) {
    3.28          var row = document.getElementById(id).insertRow(-1);
    3.29          for (var j=0; j<=cols && j<=26; j++) {