@@ -181,9 +181,9 @@ function write_comparaison () {

     fi

     content="/dev/shm/$result/content.xml"

     id_cols=(Scrutin Date Séance Titre Adoption Dossier)

+    declare -A style=(["Pour"]=Good ["Contre"]=Bad ["Abstention"]=Neutral ["oui"]=Good ["non"]=Bad)

     eval $(sqlite_request 'select printf("typevotes[%i]=%s;", id, nom) from votes')

-    nb_cols=$(( ${#id_cols[@]} + ${#typevotes[@]} * ${#groupe[@]} ))

-    last_col=$(awk -v n=$nb_cols 'BEGIN{printf("%c%c", n < 27 ? "" : int(n/26) + 64, (n % 26) + (n % 26 == 0 ? 26 : 0) + 64)}' | tr -d '\0')

+    nb_cols=$(( ${#id_cols[@]} + ${#groupe[@]} ))

     colors=($(awk -v n=${#groupe[@]} -v from=${from_color:-2A0636} -v to=${to_color:-D09B8A} '

         function rgbL (p) {

             r = rgb_from[1] + p * (rgb_to[1] - rgb_from[1])

@@ -206,20 +206,30 @@ function write_comparaison () {

             if (n > 1) rgbL(1)

         }

     '))

+    function get_colname () {

+        awk -v n=$1 '

+            BEGIN{

+                printf("%c%c", n < 27 ? "" : int(n/26) + 64, (n % 26) + (n % 26 == 0 ? 26 : 0) + 64)

+            }' | tr -d '\0'

+    }

     function write_cell () {

+        cell='<table:table-cell office:value-type='

         case $1 in

             url)

-                cell='<table:table-cell office:value-type="string" calcext:value-type="string">'

+                cell+='"string" calcext:value-type="string">'

                 cell+="<text:p><text:a xlink:href=$2 xlink:type=\"simple\">$3</text:a></text:p>"

                 ;;

             texte)

-                cell='<table:table-cell office:value-type="string" calcext:value-type="string">'

-                cell+="<text:p>$2</text:p>"

+                cell+='"string" calcext:value-type="string"'${style[${2:- }]:+ table:style-name=\"${style[$2]}\"}'>'

+                cell+="<text:p>${2:- }</text:p>"

                 ;;

             nombre)

-                cell="<table:table-cell office:value-type=\"float\" office:value=\"$2\" calcext:value-type=\"float\">"

+                cell+='"float" office:value="'$2'" calcext:value-type="float">'

                 cell+="<text:p>$2</text:p>"

                 ;;

+            formule)

+                cell+='"string" table:formula="of:='"$2"'" calcext:value-type="string"'${3:+ table:style-name=\"${3}\"}'>'

+                ;;

             *)

                 return 1;;

         esac

@@ -272,11 +282,20 @@ EOcontent

     <style:style style:name="ta1" style:family="table" style:master-page-name="Default">

     <style:table-properties table:display="true" style:writing-mode="lr-tb"/>

     </style:style>

+    <style:style style:name="T1" style:family="text">

+    <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold" fo:color="#5eb91e"/>

+    </style:style>

+    <style:style style:name="T2" style:family="text">

+    <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold" fo:color="#c9211e"/>

+    </style:style>

+    <style:style style:name="T3" style:family="text">

+    <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold" fo:color="#e8a202"/>

+    </style:style>

 EOcontent

     for i in $(seq ${#groupe[@]}); do

         cat >> "$content" << EOcontent

-        <style:style style:name="ce$i" style:family="table-cell" style:parent-style-name="Default">

+        <style:style style:name="groupe$i" style:family="table-cell" style:parent-style-name="Default">

         <style:table-cell-properties fo:wrap-option="wrap" style:vertical-align="middle" fo:background-color="#${colors[$i]%:*}"/>

         <style:text-properties fo:hyphenate="false" fo:color="#${colors[$i]}"/>

         </style:style>

@@ -293,12 +312,10 @@ EOcontent

     <table:table-column table:style-name="co1" table:number-columns-repeated="${#id_cols[@]}" table:default-cell-style-name="Default"/>

 EOcontent

-    for i in $(seq ${#typevotes[@]}); do

-        for g in $(seq ${#groupe[@]}); do

-            cat >> "$content" << EOcontent

-            <table:table-column table:style-name="co1" table:default-cell-style-name="ce$g"/>

+    for g in $(seq ${#groupe[@]}); do

+        cat >> "$content" << EOcontent

+        <table:table-column table:style-name="co1" table:default-cell-style-name="ce$g"/>

 EOcontent

-        done

     done

     echo '<table:table-row table:style-name="ro1">' >> "$content"

@@ -307,10 +324,9 @@ EOcontent

         write_cell texte $colonne

     done

-    for typevote in ${typevotes[@]}; do

-        for g in "${groupe[@]}"; do

-            write_cell texte "$typevote - $g"

-        done

+    for (( g=0; g<${#groupe[@]}; g++ )); do

+        colname=$(get_colname $(( ${#id_cols[@]} + $g + 1)) )

+        write_cell formule "COM.MICROSOFT.CONCAT("${groupe[$g]} ("; $(($last-$first+1))-COUNTIF([.${colname}2:.${colname}$(($last-$first+2))];" "); ")")" groupe$(($g+1))

     done

     echo '</table:table-row>' >> "$content"

@@ -342,37 +358,38 @@ EOcontent

         write_cell url   "${dossier_url/#null/\"\"}" "${dossier_texte/#null}"

         unset votes

-        for typevote in $(seq ${#typevotes[@]}); do

-            for (( g = 0; g < ${#groupe[@]}; g++ )); do

-                votes[${#votes[@]}]=$(sqlite_request "select

-                                            count(député)

-                                         from

-                                            dépouillements

-                                         inner join

-                                            députés, groupes

-                                         on

-                                            députés.groupe = groupes.id and dépouillements.député = députés.id

-                                         where

-                                            scrutin is $scrutin

-                                         and

-                                            vote is $typevote

-                                         and

-                                            ${id_groupe[$g]%:*}.nom = '${groupe[$g]//\'/\'\'}'")

-            done

-        done

-        for ((j = 0; j < ${#groupe[@]}; j++)); do

-            presence=1 # `let presence+=0` sort en erreur si variable est unset ou égale à 0

-            for ((i = $j; i < ${#votes[@]}; i += ${#groupe[@]})); do

-                let presence+=${votes[$i]}

-            done

-            if test $presence -eq 1; then

-                for ((i = $j; i < ${#votes[@]}; i += ${#groupe[@]})); do

-                    votes[$i]=-1

-                done

-            fi

+        for (( g = 0; g < ${#groupe[@]}; g++ )); do

+            case ${id_groupe[$g]%:*} in

+                groupes)

+                    unset _vote

+                    eval $(sqlite_request "select '_vote[' || vote || ']=' || count(vote) from dépouillements

+                                           where scrutin = $scrutin and député in (

+                                               select id from députés

+                                               where groupe in (${id_groupe[$g]#*:})

+                                           )

+                                           group by vote")

+                    if test ${#_vote[@]} -gt 0; then

+                        unset _votes

+                        for i in {1..3}; do

+                            _votes+="<text:span text:style-name=\"T$i\">${_vote[$i]:-0}</text:span> / "

+                        done

+                        _votes+="${_vote[4]:-0}"

+                        votes[${#votes[@]}]=$_votes

+                    else

+                        votes[${#votes[@]}]=" "

+                    fi

+                ;;

+                députés)

+                    votes[${#votes[@]}]=$(sqlite_request "select nom from votes

+                                                          where id in (

+                                                              select vote from dépouillements

+                                                              where scrutin = $scrutin and député in (${id_groupe[$g]#*:})

+                                                          )")

+                ;;

+            esac

         done

         for ((i = 0; i < ${#votes[@]}; i ++)); do

-            write_cell nombre ${votes[$i]}

+            write_cell texte ${votes[$i]}

         done

         echo '</table:table-row>' >> "$content"

@@ -393,7 +410,7 @@ EOcontent

     </table:table>

     <table:named-expressions/>

     <table:database-ranges>

-    <table:database-range table:name="__Anonymous_Sheet_DB__0" table:target-range-address="&apos;$result&apos;.D1:&apos;$result&apos;.$last_col$line" table:display-filter-buttons="true"/>

+    <table:database-range table:name="__Anonymous_Sheet_DB__0" table:target-range-address="&apos;$result&apos;.D1:&apos;$result&apos;.$(get_colname $nb_cols)$line" table:display-filter-buttons="true"/>

     </table:database-ranges>

     </office:spreadsheet>

     </office:body>