Author: tchemit Date: 2014-01-20 17:51:25 +0100 (Mon, 20 Jan 2014) New Revision: 1514 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1514 Log: refs #4135: [EXPORT GENERIQUE] demande d'?\195?\169volutions (update birt report) Modified: trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/reports/controle_data_allegro_campagne.rptdesign Modified: trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/reports/controle_data_allegro_campagne.rptdesign =================================================================== --- trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/reports/controle_data_allegro_campagne.rptdesign 2014-01-20 15:12:33 UTC (rev 1513) +++ trunk/tutti-service/src/test/resources/report/2013.12.05/allegro-tutti/reports/controle_data_allegro_campagne.rptdesign 2014-01-20 16:51:25 UTC (rev 1514) @@ -212,21 +212,6 @@ <text-property name="heading">Distance</text-property> </structure> <structure> - <property name="columnName">Ouv_Verticale</property> - <property name="analysis">dimension</property> - <text-property name="heading">Ouv_Verticale</text-property> - </structure> - <structure> - <property name="columnName">Ouv_Horizontale_Ailes</property> - <property name="analysis">dimension</property> - <text-property name="heading">Ouv_Horizontale_Ailes</text-property> - </structure> - <structure> - <property name="columnName">Ouv_Horizontale_Panneaux</property> - <property name="analysis">dimension</property> - <text-property name="heading">Ouv_Horizontale_Panneaux</text-property> - </structure> - <structure> <property name="columnName">Saisisseur</property> <property name="analysis">dimension</property> <text-property name="heading">Saisisseur</text-property> @@ -568,221 +553,206 @@ </structure> <structure> <property name="position">22</property> - <property name="name">Ouv_Verticale</property> - <property name="dataType">string</property> - </structure> - <structure> - <property name="position">23</property> - <property name="name">Ouv_Horizontale_Ailes</property> - <property name="dataType">string</property> - </structure> - <structure> - <property name="position">24</property> - <property name="name">Ouv_Horizontale_Panneaux</property> - <property name="dataType">string</property> - </structure> - <structure> - <property name="position">25</property> <property name="name">Saisisseur</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">26</property> + <property name="position">23</property> <property name="name">NavireAssocie</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">27</property> + <property name="position">24</property> <property name="name">Commentaire</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">28</property> + <property name="position">25</property> <property name="name">Poids_Total</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">29</property> + <property name="position">26</property> <property name="name">Poids_Total_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">30</property> + <property name="position">27</property> <property name="name">Poids_Total_Vrac</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">31</property> + <property name="position">28</property> <property name="name">Poids_Total_Vrac_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">32</property> + <property name="position">29</property> <property name="name">Poids_Total_HorsVrac</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">33</property> + <property name="position">30</property> <property name="name">Poids_Total_HorsVrac_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">34</property> + <property name="position">31</property> <property name="name">Poids_Total_Non_Trie</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">35</property> + <property name="position">32</property> <property name="name">Poids_Total_Non_Trie_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">36</property> + <property name="position">33</property> <property name="name">Poids_Total_Tremis</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">37</property> + <property name="position">34</property> <property name="name">Poids_Total_Tremis_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">38</property> + <property name="position">35</property> <property name="name">Poids_Total_Carroussel</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">39</property> + <property name="position">36</property> <property name="name">Poids_Total_Carroussel_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">40</property> + <property name="position">37</property> <property name="name">Poids_Total_Espece</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">41</property> + <property name="position">38</property> <property name="name">Poids_Total_Espece_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">42</property> + <property name="position">39</property> <property name="name">Poids_Total_Espece_Vrac</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">43</property> + <property name="position">40</property> <property name="name">Poids_Total_Espece_Vrac_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">44</property> + <property name="position">41</property> <property name="name">Poids_Total_Espece_Vrac_Trie</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">45</property> + <property name="position">42</property> <property name="name">Poids_Total_Espece_Vrac_Trie_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">46</property> + <property name="position">43</property> <property name="name">Poids_Total_Espece_HorsVrac</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">47</property> + <property name="position">44</property> <property name="name">Poids_Total_Espece_HorsVrac_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">48</property> + <property name="position">45</property> <property name="name">Poids_Total_Espece_Inerte_Trie</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">49</property> + <property name="position">46</property> <property name="name">Poids_Total_Espece_Inerte_Trie_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">50</property> + <property name="position">47</property> <property name="name">Poids_Total_Espece_Vivant_non_detaille_trie</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">51</property> + <property name="position">48</property> <property name="name">Poids_Total_Espece_Vivant_non_detaille_trie_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">52</property> + <property name="position">49</property> <property name="name">Poids_Total_Benthos</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">53</property> + <property name="position">50</property> <property name="name">Poids_Total_Benthos_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">54</property> + <property name="position">51</property> <property name="name">Poids_Total_Benthos_Vrac</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">55</property> + <property name="position">52</property> <property name="name">Poids_Total_Benthos_Vrac_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">56</property> + <property name="position">53</property> <property name="name">Poids_Total_Benthos_Vrac_Trie</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">57</property> + <property name="position">54</property> <property name="name">Poids_Total_Benthos_Vrac_Trie_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">58</property> + <property name="position">55</property> <property name="name">Poids_Total_Benthos_HorsVrac</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">59</property> + <property name="position">56</property> <property name="name">Poids_Total_Benthos_HorsVrac_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">60</property> + <property name="position">57</property> <property name="name">Poids_Total_Benthos_Inerte_Trie</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">61</property> + <property name="position">58</property> <property name="name">Poids_Total_Benthos_Inerte_Trie_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">62</property> + <property name="position">59</property> <property name="name">Poids_Total_Benthos_Vivant_non_detaille_trie</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">63</property> + <property name="position">60</property> <property name="name">Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">64</property> + <property name="position">61</property> <property name="name">Poids_Total_Macro_Dechet</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">65</property> + <property name="position">62</property> <property name="name">Poids_Total_Macro_Dechet_Calcule</property> <property name="dataType">string</property> </structure> @@ -939,314 +909,293 @@ </structure> <structure> <property name="position">22</property> - <property name="name">Ouv_Verticale</property> - <property name="nativeName">Ouv_Verticale</property> - <property name="dataType">string</property> - <property name="nativeDataType">12</property> - </structure> - <structure> - <property name="position">23</property> - <property name="name">Ouv_Horizontale_Ailes</property> - <property name="nativeName">Ouv_Horizontale_Ailes</property> - <property name="dataType">string</property> - <property name="nativeDataType">12</property> - </structure> - <structure> - <property name="position">24</property> - <property name="name">Ouv_Horizontale_Panneaux</property> - <property name="nativeName">Ouv_Horizontale_Panneaux</property> - <property name="dataType">string</property> - <property name="nativeDataType">12</property> - </structure> - <structure> - <property name="position">25</property> <property name="name">Saisisseur</property> <property name="nativeName">Saisisseur</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">26</property> + <property name="position">23</property> <property name="name">NavireAssocie</property> <property name="nativeName">NavireAssocie</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">27</property> + <property name="position">24</property> <property name="name">Commentaire</property> <property name="nativeName">Commentaire</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">28</property> + <property name="position">25</property> <property name="name">Poids_Total</property> <property name="nativeName">Poids_Total</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">29</property> + <property name="position">26</property> <property name="name">Poids_Total_Calcule</property> <property name="nativeName">Poids_Total_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">30</property> + <property name="position">27</property> <property name="name">Poids_Total_Vrac</property> <property name="nativeName">Poids_Total_Vrac</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">31</property> + <property name="position">28</property> <property name="name">Poids_Total_Vrac_Calcule</property> <property name="nativeName">Poids_Total_Vrac_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">32</property> + <property name="position">29</property> <property name="name">Poids_Total_HorsVrac</property> <property name="nativeName">Poids_Total_HorsVrac</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">33</property> + <property name="position">30</property> <property name="name">Poids_Total_HorsVrac_Calcule</property> <property name="nativeName">Poids_Total_HorsVrac_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">34</property> + <property name="position">31</property> <property name="name">Poids_Total_Non_Trie</property> <property name="nativeName">Poids_Total_Non_Trie</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">35</property> + <property name="position">32</property> <property name="name">Poids_Total_Non_Trie_Calcule</property> <property name="nativeName">Poids_Total_Non_Trie_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">36</property> + <property name="position">33</property> <property name="name">Poids_Total_Tremis</property> <property name="nativeName">Poids_Total_Tremis</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">37</property> + <property name="position">34</property> <property name="name">Poids_Total_Tremis_Calcule</property> <property name="nativeName">Poids_Total_Tremis_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">38</property> + <property name="position">35</property> <property name="name">Poids_Total_Carroussel</property> <property name="nativeName">Poids_Total_Carroussel</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">39</property> + <property name="position">36</property> <property name="name">Poids_Total_Carroussel_Calcule</property> <property name="nativeName">Poids_Total_Carroussel_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">40</property> + <property name="position">37</property> <property name="name">Poids_Total_Espece</property> <property name="nativeName">Poids_Total_Espece</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">41</property> + <property name="position">38</property> <property name="name">Poids_Total_Espece_Calcule</property> <property name="nativeName">Poids_Total_Espece_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">42</property> + <property name="position">39</property> <property name="name">Poids_Total_Espece_Vrac</property> <property name="nativeName">Poids_Total_Espece_Vrac</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">43</property> + <property name="position">40</property> <property name="name">Poids_Total_Espece_Vrac_Calcule</property> <property name="nativeName">Poids_Total_Espece_Vrac_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">44</property> + <property name="position">41</property> <property name="name">Poids_Total_Espece_Vrac_Trie</property> <property name="nativeName">Poids_Total_Espece_Vrac_Trie</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">45</property> + <property name="position">42</property> <property name="name">Poids_Total_Espece_Vrac_Trie_Calcule</property> <property name="nativeName">Poids_Total_Espece_Vrac_Trie_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">46</property> + <property name="position">43</property> <property name="name">Poids_Total_Espece_HorsVrac</property> <property name="nativeName">Poids_Total_Espece_HorsVrac</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">47</property> + <property name="position">44</property> <property name="name">Poids_Total_Espece_HorsVrac_Calcule</property> <property name="nativeName">Poids_Total_Espece_HorsVrac_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">48</property> + <property name="position">45</property> <property name="name">Poids_Total_Espece_Inerte_Trie</property> <property name="nativeName">Poids_Total_Espece_Inerte_Trie</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">49</property> + <property name="position">46</property> <property name="name">Poids_Total_Espece_Inerte_Trie_Calcule</property> <property name="nativeName">Poids_Total_Espece_Inerte_Trie_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">50</property> + <property name="position">47</property> <property name="name">Poids_Total_Espece_Vivant_non_detaille_trie</property> <property name="nativeName">Poids_Total_Espece_Vivant_non_detaille_trie</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">51</property> + <property name="position">48</property> <property name="name">Poids_Total_Espece_Vivant_non_detaille_trie_Calcule</property> <property name="nativeName">Poids_Total_Espece_Vivant_non_detaille_trie_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">52</property> + <property name="position">49</property> <property name="name">Poids_Total_Benthos</property> <property name="nativeName">Poids_Total_Benthos</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">53</property> + <property name="position">50</property> <property name="name">Poids_Total_Benthos_Calcule</property> <property name="nativeName">Poids_Total_Benthos_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">54</property> + <property name="position">51</property> <property name="name">Poids_Total_Benthos_Vrac</property> <property name="nativeName">Poids_Total_Benthos_Vrac</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">55</property> + <property name="position">52</property> <property name="name">Poids_Total_Benthos_Vrac_Calcule</property> <property name="nativeName">Poids_Total_Benthos_Vrac_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">56</property> + <property name="position">53</property> <property name="name">Poids_Total_Benthos_Vrac_Trie</property> <property name="nativeName">Poids_Total_Benthos_Vrac_Trie</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">57</property> + <property name="position">54</property> <property name="name">Poids_Total_Benthos_Vrac_Trie_Calcule</property> <property name="nativeName">Poids_Total_Benthos_Vrac_Trie_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">58</property> + <property name="position">55</property> <property name="name">Poids_Total_Benthos_HorsVrac</property> <property name="nativeName">Poids_Total_Benthos_HorsVrac</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">59</property> + <property name="position">56</property> <property name="name">Poids_Total_Benthos_HorsVrac_Calcule</property> <property name="nativeName">Poids_Total_Benthos_HorsVrac_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">60</property> + <property name="position">57</property> <property name="name">Poids_Total_Benthos_Inerte_Trie</property> <property name="nativeName">Poids_Total_Benthos_Inerte_Trie</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">61</property> + <property name="position">58</property> <property name="name">Poids_Total_Benthos_Inerte_Trie_Calcule</property> <property name="nativeName">Poids_Total_Benthos_Inerte_Trie_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">62</property> + <property name="position">59</property> <property name="name">Poids_Total_Benthos_Vivant_non_detaille_trie</property> <property name="nativeName">Poids_Total_Benthos_Vivant_non_detaille_trie</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">63</property> + <property name="position">60</property> <property name="name">Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule</property> <property name="nativeName">Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">64</property> + <property name="position">61</property> <property name="name">Poids_Total_Macro_Dechet</property> <property name="nativeName">Poids_Total_Macro_Dechet</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">65</property> + <property name="position">62</property> <property name="name">Poids_Total_Macro_Dechet_Calcule</property> <property name="nativeName">Poids_Total_Macro_Dechet_Calcule</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> </list-property> - <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Code_Station", "Id_Operation", "Poche", "Engin", "Navire", "DateDeb_Op", "LatDeb", "LongDeb", "DateFin_Op", "LatFin", "LongFin", "Duree", "Strate", "Sous-Strate", "Localite", "Validite_OP", "Rectiligne", "Distance", "Ouv_Verticale", "Ouv_Horizontale_Ailes", "Ouv_Horizontale_Panneaux", "Saisisseur", "NavireAssocie", "Commentaire", "Poids_Total", "Poids_Total_Calcule", "Poids_Total_Vrac", "Poids_Total_Vrac_Calcule", "Poids_Total_HorsVrac", "Poids_Total_HorsVrac_Calcule", "Poids_Total_Non_Trie", "Poids_Total_Non_Trie_Calcule", "Poids_Total_Tremis", "Poids_Total_Tremis_Calcule", "Poids_Total_Carroussel", "Poids_Total_Carroussel_Calcule", "Poids_Total_Espece", "Poids_Total_Espece_Calcule", "Poids_Total_Espece_Vrac", "Poids_Total_Espece_Vrac_Calcule", "Poids_Total_Espece_Vrac_Trie", "Poids_Total_Espece_Vrac_Trie_Calcule", "Poids_Total_Espece_HorsVrac", "Poids_Total_Espece_HorsVrac_Calcule", "Poids_Total_Espece_Inerte_Trie", "Poids_Total_Espece_Inerte_Trie_Calcule", "Poids_Total_Espece_Vivant_non_detaille_trie", "Poids_Total_Espece_Vivant_non_detaille_trie_Calcule", "Poids_Total_Benthos", "Poids_Total_Benthos_Calcule", "Poids_Total_Benthos_Vrac", "Poids_Total_Benthos_Vrac_Calcule", "Poids_Total_Benthos_Vrac_Trie", "Poids_Total_Benthos_Vrac_Trie_Calcule", "Poids_Total_Benthos_HorsVrac", "Poids_Total_Benthos_HorsVrac_Calcule", "Poids_Total_Benthos_Inerte_Trie", "Poids_Total_Benthos_Inerte_Trie_Calcule", "Poids_Total_Benthos_Vivant_non_detaille_trie", "Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule", "Poids_Total_Macro_Dechet", "Poids_Total_Macro_Dechet_Calcule" from "operation.csv" : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Code_Station","Code_Station",STRING;"Id_Operation","Id_Operation",INT;"Poche","Poche",STRING;"Engin","Engin",STRING;"Navire","Navire",STRING;"DateDeb_Op","DateDeb_Op",STRING;"LatDeb","LatDeb",STRING;"LongDeb","LongDeb",STRING;"DateFin_Op","DateFin_Op",STRING;"LatFin","LatFin",STRING;"LongFin","LongFin",STRING;"Duree","Duree",STRING;"Strate","Strate",STRING;"Sous-Strate","Sous-Strate",STRING;"Localite","Localite",STRING;"Validite_OP","Validite_OP",STRING;"Rectiligne","Rectiligne",STRING;"Distance","Distance",BIGDECIMAL;"Ouv_Verticale","Ouv_Verticale",STRING;"Ouv_Horizontale_Ailes","Ouv_Horizontale_Ailes",STRING;"Ouv_Horizontale_Panneaux","Ouv_Horizontale_Panneaux",STRING;"Saisisseur","Saisisseur",STRING;"NavireAssocie","NavireAssocie",STRING;"Commentaire","Commentaire",STRING;"Poids_Total","Poids_Total",BIGDECIMAL;"Poids_Total_Calcule","Poids_Total_Calcule",STRING;"Poids_Total_Vrac","Poids_Total_Vrac",BIGDECIMAL;"Poids_Total_Vrac_Calcule","Poids_Total_Vrac_Calcule",STRING;"Poids_Total_HorsVrac","Poids_Total_HorsVrac",BIGDECIMAL;"Poids_Total_HorsVrac_Calcule","Poids_Total_HorsVrac_Calcule",STRING;"Poids_Total_Non_Trie","Poids_Total_Non_Trie",BIGDECIMAL;"Poids_Total_Non_Trie_Calcule","Poids_Total_Non_Trie_Calcule",STRING;"Poids_Total_Tremis","Poids_Total_Tremis",BIGDECIMAL;"Poids_Total_Tremis_Calcule","Poids_Total_Tremis_Calcule",STRING;"Poids_Total_Carroussel","Poids_Total_Carroussel",BIGDECIMAL;"Poids_Total_Carroussel_Calcule","Poids_Total_Carroussel_Calcule",STRING;"Poids_Total_Espece","Poids_Total_Espece",BIGDECIMAL;"Poids_Total_Espece_Calcule","Poids_Total_Espece_Calcule",STRING;"Poids_Total_Espece_Vrac","Poids_Total_Espece_Vrac",BIGDECIMAL;"Poids_Total_Espece_Vrac_Calcule","Poids_Total_Espece_Vrac_Calcule",STRING;"Poids_Total_Espece_Vrac_Trie","Poids_Total_Espece_Vrac_Trie",BIGDECIMAL;"Poids_Total_Espece_Vrac_Trie_Calcule","Poids_Total_Espece_Vrac_Trie_Calcule",STRING;"Poids_Total_Espece_HorsVrac","Poids_Total_Espece_HorsVrac",BIGDECIMAL;"Poids_Total_Espece_HorsVrac_Calcule","Poids_Total_Espece_HorsVrac_Calcule",STRING;"Poids_Total_Espece_Inerte_Trie","Poids_Total_Espece_Inerte_Trie",BIGDECIMAL;"Poids_Total_Espece_Inerte_Trie_Calcule","Poids_Total_Espece_Inerte_Trie_Calcule",STRING;"Poids_Total_Espece_Vivant_non_detaille_trie","Poids_Total_Espece_Vivant_non_detaille_trie",BIGDECIMAL;"Poids_Total_Espece_Vivant_non_detaille_trie_Calcule","Poids_Total_Espece_Vivant_non_detaille_trie_Calcule",STRING;"Poids_Total_Benthos","Poids_Total_Benthos",BIGDECIMAL;"Poids_Total_Benthos_Calcule","Poids_Total_Benthos_Calcule",STRING;"Poids_Total_Benthos_Vrac","Poids_Total_Benthos_Vrac",BIGDECIMAL;"Poids_Total_Benthos_Vrac_Calcule","Poids_Total_Benthos_Vrac_Calcule",STRING;"Poids_Total_Benthos_Vrac_Trie","Poids_Total_Benthos_Vrac_Trie",BIGDECIMAL;"Poids_Total_Benthos_Vrac_Trie_Calcule","Poids_Total_Benthos_Vrac_Trie_Calcule",STRING;"Poids_Total_Benthos_HorsVrac","Poids_Total_Benthos_HorsVrac",BIGDECIMAL;"Poids_Total_Benthos_HorsVrac_Calcule","Poids_Total_Benthos_HorsVrac_Calcule",STRING;"Poids_Total_Benthos_Inerte_Trie","Poids_Total_Benthos_Inerte_Trie",BIGDECIMAL;"Poids_Total_Benthos_Inerte_Trie_Calcule","Poids_Total_Benthos_Inerte_Trie_Calcule",STRING;"Poids_Total_Benthos_Vivant_non_detaille_trie","Poids_Total_Benthos_Vivant_non_detaille_trie",BIGDECIMAL;"Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule","Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule",STRING;"Poids_Total_Macro_Dechet","Poids_Total_Macro_Dechet",BIGDECIMAL;"Poids_Total_Macro_Dechet_Calcule","Poids_Total_Macro_Dechet_Calcule",STRING}]]></xml-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Code_Station", "Id_Operation", "Poche", "Engin", "Navire", "DateDeb_Op", "LatDeb", "LongDeb", "DateFin_Op", "LatFin", "LongFin", "Duree", "Strate", "Sous-Strate", "Localite", "Validite_OP", "Rectiligne", "Distance", "Saisisseur", "NavireAssocie", "Commentaire", "Poids_Total", "Poids_Total_Calcule", "Poids_Total_Vrac", "Poids_Total_Vrac_Calcule", "Poids_Total_HorsVrac", "Poids_Total_HorsVrac_Calcule", "Poids_Total_Non_Trie", "Poids_Total_Non_Trie_Calcule", "Poids_Total_Tremis", "Poids_Total_Tremis_Calcule", "Poids_Total_Carroussel", "Poids_Total_Carroussel_Calcule", "Poids_Total_Espece", "Poids_Total_Espece_Calcule", "Poids_Total_Espece_Vrac", "Poids_Total_Espece_Vrac_Calcule", "Poids_Total_Espece_Vrac_Trie", "Poids_Total_Espece_Vrac_Trie_Calcule", "Poids_Total_Espece_HorsVrac", "Poids_Total_Espece_HorsVrac_Calcule", "Poids_Total_Espece_Inerte_Trie", "Poids_Total_Espece_Inerte_Trie_Calcule", "Poids_Total_Espece_Vivant_non_detaille_trie", "Poids_Total_Espece_Vivant_non_detaille_trie_Calcule", "Poids_Total_Benthos", "Poids_Total_Benthos_Calcule", "Poids_Total_Benthos_Vrac", "Poids_Total_Benthos_Vrac_Calcule", "Poids_Total_Benthos_Vrac_Trie", "Poids_Total_Benthos_Vrac_Trie_Calcule", "Poids_Total_Benthos_HorsVrac", "Poids_Total_Benthos_HorsVrac_Calcule", "Poids_Total_Benthos_Inerte_Trie", "Poids_Total_Benthos_Inerte_Trie_Calcule", "Poids_Total_Benthos_Vivant_non_detaille_trie", "Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule", "Poids_Total_Macro_Dechet", "Poids_Total_Macro_Dechet_Calcule" from "operation.csv" : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Code_Station","Code_Station",STRING;"Id_Operation","Id_Operation",INT;"Poche","Poche",STRING;"Engin","Engin",STRING;"Navire","Navire",STRING;"DateDeb_Op","DateDeb_Op",STRING;"LatDeb","LatDeb",STRING;"LongDeb","LongDeb",STRING;"DateFin_Op","DateFin_Op",STRING;"LatFin","LatFin",STRING;"LongFin","LongFin",STRING;"Duree","Duree",STRING;"Strate","Strate",STRING;"Sous-Strate","Sous-Strate",STRING;"Localite","Localite",STRING;"Validite_OP","Validite_OP",STRING;"Rectiligne","Rectiligne",STRING;"Distance","Distance",BIGDECIMAL;"Saisisseur","Saisisseur",STRING;"NavireAssocie","NavireAssocie",STRING;"Commentaire","Commentaire",STRING;"Poids_Total","Poids_Total",BIGDECIMAL;"Poids_Total_Calcule","Poids_Total_Calcule",STRING;"Poids_Total_Vrac","Poids_Total_Vrac",BIGDECIMAL;"Poids_Total_Vrac_Calcule","Poids_Total_Vrac_Calcule",STRING;"Poids_Total_HorsVrac","Poids_Total_HorsVrac",BIGDECIMAL;"Poids_Total_HorsVrac_Calcule","Poids_Total_HorsVrac_Calcule",STRING;"Poids_Total_Non_Trie","Poids_Total_Non_Trie",BIGDECIMAL;"Poids_Total_Non_Trie_Calcule","Poids_Total_Non_Trie_Calcule",STRING;"Poids_Total_Tremis","Poids_Total_Tremis",BIGDECIMAL;"Poids_Total_Tremis_Calcule","Poids_Total_Tremis_Calcule",STRING;"Poids_Total_Carroussel","Poids_Total_Carroussel",BIGDECIMAL;"Poids_Total_Carroussel_Calcule","Poids_Total_Carroussel_Calcule",STRING;"Poids_Total_Espece","Poids_Total_Espece",BIGDECIMAL;"Poids_Total_Espece_Calcule","Poids_Total_Espece_Calcule",STRING;"Poids_Total_Espece_Vrac","Poids_Total_Espece_Vrac",BIGDECIMAL;"Poids_Total_Espece_Vrac_Calcule","Poids_Total_Espece_Vrac_Calcule",STRING;"Poids_Total_Espece_Vrac_Trie","Poids_Total_Espece_Vrac_Trie",BIGDECIMAL;"Poids_Total_Espece_Vrac_Trie_Calcule","Poids_Total_Espece_Vrac_Trie_Calcule",STRING;"Poids_Total_Espece_HorsVrac","Poids_Total_Espece_HorsVrac",BIGDECIMAL;"Poids_Total_Espece_HorsVrac_Calcule","Poids_Total_Espece_HorsVrac_Calcule",STRING;"Poids_Total_Espece_Inerte_Trie","Poids_Total_Espece_Inerte_Trie",BIGDECIMAL;"Poids_Total_Espece_Inerte_Trie_Calcule","Poids_Total_Espece_Inerte_Trie_Calcule",STRING;"Poids_Total_Espece_Vivant_non_detaille_trie","Poids_Total_Espece_Vivant_non_detaille_trie",BIGDECIMAL;"Poids_Total_Espece_Vivant_non_detaille_trie_Calcule","Poids_Total_Espece_Vivant_non_detaille_trie_Calcule",STRING;"Poids_Total_Benthos","Poids_Total_Benthos",BIGDECIMAL;"Poids_Total_Benthos_Calcule","Poids_Total_Benthos_Calcule",STRING;"Poids_Total_Benthos_Vrac","Poids_Total_Benthos_Vrac",BIGDECIMAL;"Poids_Total_Benthos_Vrac_Calcule","Poids_Total_Benthos_Vrac_Calcule",STRING;"Poids_Total_Benthos_Vrac_Trie","Poids_Total_Benthos_Vrac_Trie",BIGDECIMAL;"Poids_Total_Benthos_Vrac_Trie_Calcule","Poids_Total_Benthos_Vrac_Trie_Calcule",STRING;"Poids_Total_Benthos_HorsVrac","Poids_Total_Benthos_HorsVrac",BIGDECIMAL;"Poids_Total_Benthos_HorsVrac_Calcule","Poids_Total_Benthos_HorsVrac_Calcule",STRING;"Poids_Total_Benthos_Inerte_Trie","Poids_Total_Benthos_Inerte_Trie",BIGDECIMAL;"Poids_Total_Benthos_Inerte_Trie_Calcule","Poids_Total_Benthos_Inerte_Trie_Calcule",STRING;"Poids_Total_Benthos_Vivant_non_detaille_trie","Poids_Total_Benthos_Vivant_non_detaille_trie",BIGDECIMAL;"Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule","Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule",STRING;"Poids_Total_Macro_Dechet","Poids_Total_Macro_Dechet",BIGDECIMAL;"Poids_Total_Macro_Dechet_Calcule","Poids_Total_Macro_Dechet_Calcule",STRING}]]></xml-property> <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> <model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> <Version>2.0</Version> @@ -1592,7 +1541,7 @@ <design:resultColumnDefinitions> <design:attributes> <design:identifier> - <design:name>Ouv_Verticale</design:name> + <design:name>Saisisseur</design:name> <design:position>22</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> @@ -1601,54 +1550,6 @@ <design:nullability>Unknown</design:nullability> </design:attributes> <design:usageHints> - <design:label>Ouv_Verticale</design:label> - <design:formattingHints/> - </design:usageHints> - </design:resultColumnDefinitions> - <design:resultColumnDefinitions> - <design:attributes> - <design:identifier> - <design:name>Ouv_Horizontale_Ailes</design:name> - <design:position>23</design:position> - </design:identifier> - <design:nativeDataTypeCode>12</design:nativeDataTypeCode> - <design:precision>-1</design:precision> - <design:scale>-1</design:scale> - <design:nullability>Unknown</design:nullability> - </design:attributes> - <design:usageHints> - <design:label>Ouv_Horizontale_Ailes</design:label> - <design:formattingHints/> - </design:usageHints> - </design:resultColumnDefinitions> - <design:resultColumnDefinitions> - <design:attributes> - <design:identifier> - <design:name>Ouv_Horizontale_Panneaux</design:name> - <design:position>24</design:position> - </design:identifier> - <design:nativeDataTypeCode>12</design:nativeDataTypeCode> - <design:precision>-1</design:precision> - <design:scale>-1</design:scale> - <design:nullability>Unknown</design:nullability> - </design:attributes> - <design:usageHints> - <design:label>Ouv_Horizontale_Panneaux</design:label> - <design:formattingHints/> - </design:usageHints> - </design:resultColumnDefinitions> - <design:resultColumnDefinitions> - <design:attributes> - <design:identifier> - <design:name>Saisisseur</design:name> - <design:position>25</design:position> - </design:identifier> - <design:nativeDataTypeCode>12</design:nativeDataTypeCode> - <design:precision>-1</design:precision> - <design:scale>-1</design:scale> - <design:nullability>Unknown</design:nullability> - </design:attributes> - <design:usageHints> <design:label>Saisisseur</design:label> <design:formattingHints/> </design:usageHints> @@ -1657,7 +1558,7 @@ <design:attributes> <design:identifier> <design:name>NavireAssocie</design:name> - <design:position>26</design:position> + <design:position>23</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1673,7 +1574,7 @@ <design:attributes> <design:identifier> <design:name>Commentaire</design:name> - <design:position>27</design:position> + <design:position>24</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1689,7 +1590,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total</design:name> - <design:position>28</design:position> + <design:position>25</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1705,7 +1606,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Calcule</design:name> - <design:position>29</design:position> + <design:position>26</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1721,7 +1622,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Vrac</design:name> - <design:position>30</design:position> + <design:position>27</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1737,7 +1638,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Vrac_Calcule</design:name> - <design:position>31</design:position> + <design:position>28</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1753,7 +1654,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_HorsVrac</design:name> - <design:position>32</design:position> + <design:position>29</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1769,7 +1670,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_HorsVrac_Calcule</design:name> - <design:position>33</design:position> + <design:position>30</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1785,7 +1686,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Non_Trie</design:name> - <design:position>34</design:position> + <design:position>31</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1801,7 +1702,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Non_Trie_Calcule</design:name> - <design:position>35</design:position> + <design:position>32</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1817,7 +1718,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Tremis</design:name> - <design:position>36</design:position> + <design:position>33</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1833,7 +1734,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Tremis_Calcule</design:name> - <design:position>37</design:position> + <design:position>34</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1849,7 +1750,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Carroussel</design:name> - <design:position>38</design:position> + <design:position>35</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1865,7 +1766,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Carroussel_Calcule</design:name> - <design:position>39</design:position> + <design:position>36</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1881,7 +1782,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Espece</design:name> - <design:position>40</design:position> + <design:position>37</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1897,7 +1798,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Espece_Calcule</design:name> - <design:position>41</design:position> + <design:position>38</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1913,7 +1814,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Espece_Vrac</design:name> - <design:position>42</design:position> + <design:position>39</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1929,7 +1830,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Espece_Vrac_Calcule</design:name> - <design:position>43</design:position> + <design:position>40</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1945,7 +1846,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Espece_Vrac_Trie</design:name> - <design:position>44</design:position> + <design:position>41</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1961,7 +1862,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Espece_Vrac_Trie_Calcule</design:name> - <design:position>45</design:position> + <design:position>42</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1977,7 +1878,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Espece_HorsVrac</design:name> - <design:position>46</design:position> + <design:position>43</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -1993,7 +1894,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Espece_HorsVrac_Calcule</design:name> - <design:position>47</design:position> + <design:position>44</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2009,7 +1910,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Espece_Inerte_Trie</design:name> - <design:position>48</design:position> + <design:position>45</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2025,7 +1926,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Espece_Inerte_Trie_Calcule</design:name> - <design:position>49</design:position> + <design:position>46</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2041,7 +1942,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Espece_Vivant_non_detaille_trie</design:name> - <design:position>50</design:position> + <design:position>47</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2057,7 +1958,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Espece_Vivant_non_detaille_trie_Calcule</design:name> - <design:position>51</design:position> + <design:position>48</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2073,7 +1974,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Benthos</design:name> - <design:position>52</design:position> + <design:position>49</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2089,7 +1990,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Benthos_Calcule</design:name> - <design:position>53</design:position> + <design:position>50</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2105,7 +2006,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Benthos_Vrac</design:name> - <design:position>54</design:position> + <design:position>51</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2121,7 +2022,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Benthos_Vrac_Calcule</design:name> - <design:position>55</design:position> + <design:position>52</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2137,7 +2038,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Benthos_Vrac_Trie</design:name> - <design:position>56</design:position> + <design:position>53</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2153,7 +2054,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Benthos_Vrac_Trie_Calcule</design:name> - <design:position>57</design:position> + <design:position>54</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2169,7 +2070,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Benthos_HorsVrac</design:name> - <design:position>58</design:position> + <design:position>55</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2185,7 +2086,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Benthos_HorsVrac_Calcule</design:name> - <design:position>59</design:position> + <design:position>56</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2201,7 +2102,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Benthos_Inerte_Trie</design:name> - <design:position>60</design:position> + <design:position>57</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2217,7 +2118,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Benthos_Inerte_Trie_Calcule</design:name> - <design:position>61</design:position> + <design:position>58</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2233,7 +2134,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Benthos_Vivant_non_detaille_trie</design:name> - <design:position>62</design:position> + <design:position>59</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2249,7 +2150,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Benthos_Vivant_non_detaille_trie_Calcule</design:name> - <design:position>63</design:position> + <design:position>60</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2265,7 +2166,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Macro_Dechet</design:name> - <design:position>64</design:position> + <design:position>61</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -2281,7 +2182,7 @@ <design:attributes> <design:identifier> <design:name>Poids_Total_Macro_Dechet_Calcule</design:name> - <design:position>65</design:position> + <design:position>62</design:position> </design:identifier> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -3002,31 +2903,26 @@ </structure> <structure> <property name="position">8</property> - <property name="name">Navire</property> - <property name="dataType">string</property> - </structure> - <structure> - <property name="position">9</property> <property name="name">MarineLitterCategory</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">10</property> + <property name="position">9</property> <property name="name">MarineLitterSizeCategory</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">11</property> + <property name="position">10</property> <property name="name">Number</property> <property name="dataType">integer</property> </structure> <structure> - <property name="position">12</property> + <property name="position">11</property> <property name="name">Weight</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">13</property> + <property name="position">12</property> <property name="name">Commentaire</property> <property name="dataType">string</property> </structure> @@ -3085,48 +2981,41 @@ </structure> <structure> <property name="position">8</property> - <property name="name">Navire</property> - <property name="nativeName">Navire</property> - <property name="dataType">string</property> - <property name="nativeDataType">12</property> - </structure> - <structure> - <property name="position">9</property> <property name="name">MarineLitterCategory</property> <property name="nativeName">MarineLitterCategory</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">10</property> + <property name="position">9</property> <property name="name">MarineLitterSizeCategory</property> <property name="nativeName">MarineLitterSizeCategory</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">11</property> + <property name="position">10</property> <property name="name">Number</property> <property name="nativeName">Number</property> <property name="dataType">integer</property> <property name="nativeDataType">4</property> </structure> <structure> - <property name="position">12</property> + <property name="position">11</property> <property name="name">Weight</property> <property name="nativeName">Weight</property> <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> <structure> - <property name="position">13</property> + <property name="position">12</property> <property name="name">Commentaire</property> <property name="nativeName">Commentaire</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> </list-property> - <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Id_Operation", "Poche", "Navire", "MarineLitterCategory", "MarineLitterSizeCategory", "Number", "Weight", "Commentaire" from marineLitter.csv : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Id_Operation","Id_Operation",INT;"Poche","Poche",STRING;"Navire","Navire",STRING;"MarineLitterCategory","MarineLitterCategory",STRING;"MarineLitterSizeCategory","MarineLitterSizeCategory",STRING;"Number","Number",INT;"Weight","Weight",BIGDECIMAL;"Commentaire","Commentaire",STRING}]]></xml-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Id_Operation", "Poche", "MarineLitterCategory", "MarineLitterSizeCategory", "Number", "Weight", "Commentaire" from marineLitter.csv : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Id_Operation","Id_Operation",INT;"Poche","Poche",STRING;"Navire","Navire",STRING;"MarineLitterCategory","MarineLitterCategory",STRING;"MarineLitterSizeCategory","MarineLitterSizeCategory",STRING;"Number","Number",INT;"Weight","Weight",BIGDECIMAL;"Commentaire","Commentaire",STRING}]]></xml-property> <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> <model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> <Version>1.0</Version> @@ -3233,7 +3122,7 @@ </design:resultColumnDefinitions> <design:resultColumnDefinitions> <design:attributes> - <design:name>Navire</design:name> + <design:name>MarineLitterCategory</design:name> <design:position>8</design:position> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> @@ -3241,20 +3130,6 @@ <design:nullability>Unknown</design:nullability> </design:attributes> <design:usageHints> - <design:label>Navire</design:label> - <design:formattingHints/> - </design:usageHints> - </design:resultColumnDefinitions> - <design:resultColumnDefinitions> - <design:attributes> - <design:name>MarineLitterCategory</design:name> - <design:position>9</design:position> - <design:nativeDataTypeCode>12</design:nativeDataTypeCode> - <design:precision>-1</design:precision> - <design:scale>-1</design:scale> - <design:nullability>Unknown</design:nullability> - </design:attributes> - <design:usageHints> <design:label>MarineLitterCategory</design:label> <design:formattingHints/> </design:usageHints> @@ -3262,7 +3137,7 @@ <design:resultColumnDefinitions> <design:attributes> <design:name>MarineLitterSizeCategory</design:name> - <design:position>10</design:position> + <design:position>9</design:position> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> <design:scale>-1</design:scale> @@ -3276,7 +3151,7 @@ <design:resultColumnDefinitions> <design:attributes> <design:name>Number</design:name> - <design:position>11</design:position> + <design:position>10</design:position> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> <design:scale>-1</design:scale> @@ -3290,7 +3165,7 @@ <design:resultColumnDefinitions> <design:attributes> <design:name>Weight</design:name> - <design:position>12</design:position> + <design:position>11</design:position> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> <design:scale>-1</design:scale> @@ -3304,7 +3179,7 @@ <design:resultColumnDefinitions> <design:attributes> <design:name>Commentaire</design:name> - <design:position>13</design:position> + <design:position>12</design:position> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> <design:scale>-1</design:scale> @@ -3398,16 +3273,16 @@ <text-property name="heading">Poche</text-property> </structure> <structure> - <property name="columnName">Navire</property> - <property name="analysis">dimension</property> - <text-property name="heading">Navire</text-property> - </structure> - <structure> <property name="columnName">Code_Taxon</property> <property name="analysis">measure</property> <text-property name="heading">Code_Taxon</text-property> </structure> <structure> + <property name="columnName">Code_Espece_Campagne</property> + <property name="analysis">measure</property> + <text-property name="heading">Code_Espece_Campagne</text-property> + </structure> + <structure> <property name="columnName">Nom_scientifique</property> <property name="analysis">dimension</property> <text-property name="heading">Nom_scientifique</text-property> @@ -3617,6 +3492,11 @@ <property name="analysis">measure</property> <text-property name="heading">Coef_Elev_Espece_Capture</text-property> </structure> + <structure> + <property name="columnName">Coef_Final_Elevation</property> + <property name="analysis">measure</property> + <text-property name="heading">Coef_Final_Elevation</text-property> + </structure> </list-property> <list-property name="parameters"/> <structure name="cachedMetaData"> @@ -3658,13 +3538,13 @@ </structure> <structure> <property name="position">8</property> - <property name="name">Navire</property> - <property name="dataType">string</property> + <property name="name">Code_Taxon</property> + <property name="dataType">integer</property> </structure> <structure> <property name="position">9</property> - <property name="name">Code_Taxon</property> - <property name="dataType">integer</property> + <property name="name">Code_Espece_Campagne</property> + <property name="dataType">string</property> </structure> <structure> <property name="position">10</property> @@ -3878,6 +3758,11 @@ </structure> <structure> <property name="position">52</property> + <property name="name">Coef_Final_Elevation</property> + <property name="dataType">decimal</property> + </structure> + <structure> + <property name="position">53</property> <property name="name">categorisation-du-lot</property> <property name="dataType">string</property> </structure> @@ -3936,19 +3821,19 @@ </structure> <structure> <property name="position">8</property> - <property name="name">Navire</property> - <property name="nativeName">Navire</property> - <property name="dataType">string</property> - <property name="nativeDataType">12</property> - </structure> - <structure> - <property name="position">9</property> <property name="name">Code_Taxon</property> <property name="nativeName">Code_Taxon</property> <property name="dataType">integer</property> <property name="nativeDataType">4</property> </structure> <structure> + <property name="position">9</property> + <property name="name">Code_Espece_Campagne</property> + <property name="nativeName">Code_Espece_Campagne</property> + <property name="dataType">string</property> + <property name="nativeDataType">12</property> + </structure> + <structure> <property name="position">10</property> <property name="name">Nom_scientifique</property> <property name="nativeName">Nom_scientifique</property> @@ -4242,8 +4127,15 @@ <property name="dataType">decimal</property> <property name="nativeDataType">2</property> </structure> + <structure> + <property name="position">52</property> + <property name="name">Coef_Final_Elevation</property> + <property name="nativeName">Coef_Final_Elevation</property> + <property name="dataType">decimal</property> + <property name="nativeDataType">2</property> + </structure> </list-property> - <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Id_Operation", "Poche", "Navire", "Code_Taxon", "Nom_scientifique", "Commentaire", "V_HV", "Num_Ordre_V_HV_H2", "Tot_V_HV", "Ech_V_HV", "Type_Volume_Poids_V_HV", "Unite_Volume_Poids_V_HV", "Class_Tri_", "Num_Ordre_Class_Tri__H2", "Tot_Class_Tri_", "Ech_Class_Tri_", "Type_Volume_Poids_Class_Tri_", "Unite_Volume_Poids_Class_Tri_", "Sexe", "Num_Ordre_Sexe_H2", "Tot_Sexe", "Ech_Sexe", "Type_Volume_Poids_Sexe", "Unite_Volume_Poids_Sexe", "Maturité", "Num_Ordre_Maturité_H2", "Tot_Maturité", "Ech_Maturité", "Type_Volume_Poids_Maturité", "Unite_Volume_Poids_Maturité", "Age", "Num_Ordre_Age_H2", "Tot_Age", "Ech_Age", "Type_Volume_Poids_Age", "Unite_Volume_Poids_Age", "Code_Longueur", "Libelle_Longueur", "Taille", "NumOrdre_Taille_H2", "Poids_Classe_Taille", "Unite_Taille", "Precision_Mesure", "Nbr", "Poids_Reference", "Coef_Elev_Espece_Capture" from "catch.csv" : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Id_Operation","Id_Operation",INT;"Poche","Poche",STRING;"Navire","Navire",STRING;"Code_Taxon","Code_Taxon",INT;"Nom_scientifique","Nom_scientifique",STRING;"Commentaire","Commentaire",STRING;"V_HV","V_HV",STRING;"Num_Ordre_V_HV_H2","Num_Ordre_V_HV_H2",INT;"Tot_V_HV","Tot_V_HV",BIGDECIMAL;"Ech_V_HV","Ech_V_HV",BIGDECIMAL;"Type_Volume_Poids_V_HV","Type_Volume_Poids_V_HV",STRING;"Unite_Volume_Poids_V_HV","Unite_Volume_Poids_V_HV",STRING;"Class_Tri_","Class_Tri_",STRING;"Num_Ordre_Class_Tri__H2","Num_Ordre_Class_Tri__H2",INT;"Tot_Class_Tri_","Tot_Class_Tri_",BIGDECIMAL;"Ech_Class_Tri_","Ech_Class_Tri_",BIGDECIMAL;"Type_Volume_Poids_Class_Tri_","Type_Volume_Poids_Class_Tri_",STRING;"Unite_Volume_Poids_Class_Tri_","Unite_Volume_Poids_Class_Tri_",STRING;"Sexe","Sexe",STRING;"Num_Ordre_Sexe_H2","Num_Ordre_Sexe_H2",INT;"Tot_Sexe","Tot_Sexe",BIGDECIMAL;"Ech_Sexe","Ech_Sexe",BIGDECIMAL;"Type_Volume_Poids_Sexe","Type_Volume_Poids_Sexe",STRING;"Unite_Volume_Poids_Sexe","Unite_Volume_Poids_Sexe",STRING;"Maturité","Maturité",STRING;"Num_Ordre_Maturité_H2","Num_Ordre_Maturité_H2",INT;"Tot_Maturité","Tot_Maturité",BIGDECIMAL;"Ech_Maturité","Ech_Maturité",BIGDECIMAL;"Type_Volume_Poids_Maturité","Type_Volume_Poids_Maturité",STRING;"Unite_Volume_Poids_Maturité","Unite_Volume_Poids_Maturité",STRING;"Age","Age",STRING;"Num_Ordre_Age_H2","Num_Ordre_Age_H2",INT;"Tot_Age","Tot_Age",BIGDECIMAL;"Ech_Age","Ech_Age",BIGDECIMAL;"Type_Volume_Poids_Age","Type_Volume_Poids_Age",STRING;"Unite_Volume_Poids_Age","Unite_Volume_Poids_Age",STRING;"Code_Longueur","Code_Longueur",INT;"Libelle_Longueur","Libelle_Longueur",STRING;"Taille","Taille",BIGDECIMAL;"NumOrdre_Taille_H2","NumOrdre_Taille_H2",INT;"Poids_Classe_Taille","Poids_Classe_Taille",BIGDECIMAL;"Unite_Taille","Unite_Taille",STRING;"Precision_Mesure","Precision_Mesure",BIGDECIMAL;"Nbr","Nbr",INT;"Poids_Reference","Poids_Reference",BIGDECIMAL;"Coef_Elev_Espece_Capture","Coef_Elev_Espece_Capture",BIGDECIMAL}]]></xml-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Id_Operation", "Poche", "Code_Taxon", "Code_Espece_Campagne", "Nom_scientifique", "Commentaire", "V_HV", "Num_Ordre_V_HV_H2", "Tot_V_HV", "Ech_V_HV", "Type_Volume_Poids_V_HV", "Unite_Volume_Poids_V_HV", "Class_Tri_", "Num_Ordre_Class_Tri__H2", "Tot_Class_Tri_", "Ech_Class_Tri_", "Type_Volume_Poids_Class_Tri_", "Unite_Volume_Poids_Class_Tri_", "Sexe", "Num_Ordre_Sexe_H2", "Tot_Sexe", "Ech_Sexe", "Type_Volume_Poids_Sexe", "Unite_Volume_Poids_Sexe", "Maturité", "Num_Ordre_Maturité_H2", "Tot_Maturité", "Ech_Maturité", "Type_Volume_Poids_Maturité", "Unite_Volume_Poids_Maturité", "Age", "Num_Ordre_Age_H2", "Tot_Age", "Ech_Age", "Type_Volume_Poids_Age", "Unite_Volume_Poids_Age", "Code_Longueur", "Libelle_Longueur", "Taille", "NumOrdre_Taille_H2", "Poids_Classe_Taille", "Unite_Taille", "Precision_Mesure", "Nbr", "Poids_Reference", "Coef_Elev_Espece_Capture", "Coef_Final_Elevation" from "catch.csv" : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Id_Operation","Id_Operation",INT;"Poche","Poche",STRING;"Code_Taxon","Code_Taxon",INT;"Code_Espece_Campagne","Code_Espece_Campagne",STRING;"Nom_scientifique","Nom_scientifique",STRING;"Commentaire","Commentaire",STRING;"V_HV","V_HV",STRING;"Num_Ordre_V_HV_H2","Num_Ordre_V_HV_H2",INT;"Tot_V_HV","Tot_V_HV",BIGDECIMAL;"Ech_V_HV","Ech_V_HV",BIGDECIMAL;"Type_Volume_Poids_V_HV","Type_Volume_Poids_V_HV",STRING;"Unite_Volume_Poids_V_HV","Unite_Volume_Poids_V_HV",STRING;"Class_Tri_","Class_Tri_",STRING;"Num_Ordre_Class_Tri__H2","Num_Ordre_Class_Tri__H2",INT;"Tot_Class_Tri_","Tot_Class_Tri_",BIGDECIMAL;"Ech_Class_Tri_","Ech_Class_Tri_",BIGDECIMAL;"Type_Volume_Poids_Class_Tri_","Type_Volume_Poids_Class_Tri_",STRING;"Unite_Volume_Poids_Class_Tri_","Unite_Volume_Poids_Class_Tri_",STRING;"Sexe","Sexe",STRING;"Num_Ordre_Sexe_H2","Num_Ordre_Sexe_H2",INT;"Tot_Sexe","Tot_Sexe",BIGDECIMAL;"Ech_Sexe","Ech_Sexe",BIGDECIMAL;"Type_Volume_Poids_Sexe","Type_Volume_Poids_Sexe",STRING;"Unite_Volume_Poids_Sexe","Unite_Volume_Poids_Sexe",STRING;"Maturité","Maturité",STRING;"Num_Ordre_Maturité_H2","Num_Ordre_Maturité_H2",INT;"Tot_Maturité","Tot_Maturité",BIGDECIMAL;"Ech_Maturité","Ech_Maturité",BIGDECIMAL;"Type_Volume_Poids_Maturité","Type_Volume_Poids_Maturité",STRING;"Unite_Volume_Poids_Maturité","Unite_Volume_Poids_Maturité",STRING;"Age","Age",STRING;"Num_Ordre_Age_H2","Num_Ordre_Age_H2",INT;"Tot_Age","Tot_Age",BIGDECIMAL;"Ech_Age","Ech_Age",BIGDECIMAL;"Type_Volume_Poids_Age","Type_Volume_Poids_Age",STRING;"Unite_Volume_Poids_Age","Unite_Volume_Poids_Age",STRING;"Code_Longueur","Code_Longueur",INT;"Libelle_Longueur","Libelle_Longueur",STRING;"Taille","Taille",BIGDECIMAL;"NumOrdre_Taille_H2","NumOrdre_Taille_H2",INT;"Poids_Classe_Taille","Poids_Classe_Taille",BIGDECIMAL;"Unite_Taille","Unite_Taille",STRING;"Precision_Mesure","Precision_Mesure",BIGDECIMAL;"Nbr","Nbr",INT;"Poids_Reference","Poids_Reference",BIGDECIMAL;"Coef_Elev_Espece_Capture","Coef_Elev_Espece_Capture",BIGDECIMAL; "Coef_Final_Elevation","Coef_Final_Elevation",BIGDECIMAL}]]></xml-property> <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> <model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> <Version>2.0</Version> @@ -4365,32 +4257,32 @@ <design:resultColumnDefinitions> <design:attributes> <design:identifier> - <design:name>Navire</design:name> + <design:name>Code_Taxon</design:name> <design:position>8</design:position> </design:identifier> - <design:nativeDataTypeCode>12</design:nativeDataTypeCode> + <design:nativeDataTypeCode>4</design:nativeDataTypeCode> <design:precision>-1</design:precision> <design:scale>-1</design:scale> <design:nullability>Unknown</design:nullability> </design:attributes> <design:usageHints> - <design:label>Navire</design:label> + <design:label>Code_Taxon</design:label> <design:formattingHints/> </design:usageHints> </design:resultColumnDefinitions> <design:resultColumnDefinitions> <design:attributes> <design:identifier> - <design:name>Code_Taxon</design:name> + <design:name>Code_Espece_Campagne</design:name> <design:position>9</design:position> </design:identifier> - <design:nativeDataTypeCode>4</design:nativeDataTypeCode> + <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> <design:scale>-1</design:scale> <design:nullability>Unknown</design:nullability> </design:attributes> <design:usageHints> - <design:label>Code_Taxon</design:label> + <design:label>Code_Espece_Campagne</design:label> <design:formattingHints/> </design:usageHints> </design:resultColumnDefinitions> @@ -5066,6 +4958,22 @@ <design:formattingHints/> </design:usageHints> </design:resultColumnDefinitions> + <design:resultColumnDefinitions> + <design:attributes> + <design:identifier> + <design:name>Coef_Final_Elevation</design:name> + <design:position>52</design:position> + </design:identifier> + <design:nativeDataTypeCode>2</design:nativeDataTypeCode> + <design:precision>-1</design:precision> + <design:scale>-1</design:scale> + <design:nullability>Unknown</design:nullability> + </design:attributes> + <design:usageHints> + <design:label>Coef_Final_Elevation</design:label> + <design:formattingHints/> + </design:usageHints> + </design:resultColumnDefinitions> </design:resultSetColumns> </design:resultSetDefinitions> </design:ResultSets> @@ -5247,36 +5155,31 @@ </structure> <structure> <property name="position">8</property> - <property name="name">Navire</property> - <property name="dataType">string</property> - </structure> - <structure> - <property name="position">9</property> <property name="name">BatchId</property> <property name="dataType">integer</property> </structure> <structure> - <property name="position">10</property> + <property name="position">9</property> <property name="name">ReferenceTaxonId</property> <property name="dataType">integer</property> </structure> <structure> - <property name="position">11</property> + <property name="position">10</property> <property name="name">ReferenceTaxonName</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">12</property> + <property name="position">11</property> <property name="name">Commentaire</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">13</property> + <property name="position">12</property> <property name="name">CaracteristicId</property> <property name="dataType">integer</property> </structure> <structure> - <property name="position">14</property> + <property name="position">13</property> <property name="name">CaracteristicValue</property> <property name="dataType">string</property> </structure> @@ -5336,55 +5239,48 @@ </structure> <structure> <property name="position">8</property> - <property name="name">Navire</property> - <property name="nativeName">Navire</property> - <property name="dataType">string</property> - <property name="nativeDataType">12</property> - </structure> - <structure> - <property name="position">9</property> <property name="name">BatchId</property> <property name="nativeName">BatchId</property> <property name="dataType">integer</property> <property name="nativeDataType">4</property> </structure> <structure> - <property name="position">10</property> + <property name="position">9</property> <property name="name">ReferenceTaxonId</property> <property name="nativeName">ReferenceTaxonId</property> <property name="dataType">integer</property> <property name="nativeDataType">4</property> </structure> <structure> - <property name="position">11</property> + <property name="position">10</property> <property name="name">ReferenceTaxonName</property> <property name="nativeName">ReferenceTaxonName</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">12</property> + <property name="position">11</property> <property name="name">Commentaire</property> <property name="nativeName">Commentaire</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> <structure> - <property name="position">13</property> + <property name="position">12</property> <property name="name">CaracteristicId</property> <property name="nativeName">CaracteristicId</property> <property name="dataType">integer</property> <property name="nativeDataType">4</property> </structure> <structure> - <property name="position">14</property> + <property name="position">13</property> <property name="name">CaracteristicValue</property> <property name="nativeName">CaracteristicValue</property> <property name="dataType">string</property> <property name="nativeDataType">12</property> </structure> </list-property> - <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Id_Operation", "Poche", "Navire", "BatchId", "ReferenceTaxonId", "ReferenceTaxonName", "Commentaire", "CaracteristicId", "CaracteristicValue" from accidentalCatch.csv : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Id_Operation","Id_Operation",INT;"Poche","Poche",STRING;"Navire","Navire",STRING;"BatchId","BatchId",INT;"ReferenceTaxonId","ReferenceTaxonId",INT;"ReferenceTaxonName","ReferenceTaxonName",STRING;"Commentaire","Commentaire",STRING;"CaracteristicId","CaracteristicId",INT;"CaracteristicValue","CaracteristicValue",STRING}]]></xml-property> + <xml-property name="queryText"><![CDATA[select "Annee", "Serie", "Serie_Partielle", "Engin", "Code_Station", "Id_Operation", "Poche", "BatchId", "ReferenceTaxonId", "ReferenceTaxonName", "Commentaire", "CaracteristicId", "CaracteristicValue" from accidentalCatch.csv : {"Annee","Annee",INT;"Serie","Serie",STRING;"Serie_Partielle","Serie_Partielle",STRING;"Engin","Engin",STRING;"Code_Station","Code_Station",STRING;"Id_Operation","Id_Operation",INT;"Poche","Poche",STRING;;"BatchId","BatchId",INT;"ReferenceTaxonId","ReferenceTaxonId",INT;"ReferenceTaxonName","ReferenceTaxonName",STRING;"Commentaire","Commentaire",STRING;"CaracteristicId","CaracteristicId",INT;"CaracteristicValue","CaracteristicValue",STRING}]]></xml-property> <xml-property name="designerValues"><![CDATA[<?xml version="1.0" encoding="UTF-8"?> <model:DesignValues xmlns:design="http://www.eclipse.org/datatools/connectivity/oda/design" xmlns:model="http://www.eclipse.org/birt/report/model/adapter/odaModel"> <Version>1.0</Version> @@ -5491,22 +5387,8 @@ </design:resultColumnDefinitions> <design:resultColumnDefinitions> <design:attributes> - <design:name>Navire</design:name> - <design:position>8</design:position> - <design:nativeDataTypeCode>12</design:nativeDataTypeCode> - <design:precision>-1</design:precision> - <design:scale>-1</design:scale> - <design:nullability>Unknown</design:nullability> - </design:attributes> - <design:usageHints> - <design:label>Navire</design:label> - <design:formattingHints/> - </design:usageHints> - </design:resultColumnDefinitions> - <design:resultColumnDefinitions> - <design:attributes> <design:name>BatchId</design:name> - <design:position>9</design:position> + <design:position>8</design:position> <design:nativeDataTypeCode>4</design:nativeDataTypeCode> <design:precision>-1</design:precision> <design:scale>-1</design:scale> @@ -5520,7 +5402,7 @@ <design:resultColumnDefinitions> <design:attributes> <design:name>ReferenceTaxonId</design:name> - <design:position>10</design:position> + <design:position>9</design:position> <design:nativeDataTypeCode>4</design:nativeDataTypeCode> <design:precision>-1</design:precision> <design:scale>-1</design:scale> @@ -5534,7 +5416,7 @@ <design:resultColumnDefinitions> <design:attributes> <design:name>ReferenceTaxonName</design:name> - <design:position>11</design:position> + <design:position>10</design:position> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> <design:scale>-1</design:scale> @@ -5548,7 +5430,7 @@ <design:resultColumnDefinitions> <design:attributes> <design:name>Commentaire</design:name> - <design:position>12</design:position> + <design:position>11</design:position> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> <design:scale>-1</design:scale> @@ -5562,7 +5444,7 @@ <design:resultColumnDefinitions> <design:attributes> <design:name>CaracteristicId</design:name> - <design:position>13</design:position> + <design:position>12</design:position> <design:nativeDataTypeCode>4</design:nativeDataTypeCode> <design:precision>-1</design:precision> <design:scale>-1</design:scale> @@ -5576,7 +5458,7 @@ <design:resultColumnDefinitions> <design:attributes> <design:name>CaracteristicValue</design:name> - <design:position>14</design:position> + <design:position>13</design:position> <design:nativeDataTypeCode>12</design:nativeDataTypeCode> <design:precision>-1</design:precision> <design:scale>-1</design:scale> @@ -5622,15 +5504,15 @@ <property name="columnName">catch::Poche</property> <property name="alias">Poche</property> </structure> - <structure> - <property name="columnName">catch::Navire</property> - <property name="alias">Navire</property> - </structure> - <structure> + <structure> <property name="columnName">catch::Code_Taxon</property> <property name="alias">Code_Taxon</property> </structure> <structure> + <property name="columnName">catch::Code_Espece_Campagne</property> + <property name="alias">Code_Espece_Campagne</property> + </structure> + <structure> <property name="columnName">catch::Nom_scientifique</property> <property name="alias">Nom_scientifique</property> </structure> @@ -5799,6 +5681,10 @@ <property name="alias">Coef_Elev_Espece_Capture</property> </structure> <structure> + <property name="columnName">catch::Coef_Final_Elevation</property> + <property name="alias">Coef_Final_Elevation</property> + </structure> + <structure> <property name="columnName">catch::categorisation-du-lot</property> <property name="alias">categorisation-du-lot</property> </structure> @@ -5862,251 +5748,246 @@ </structure> <structure> <property name="position">8</property> - <property name="name">Navire</property> - <property name="dataType">string</property> - </structure> - <structure> - <property name="position">9</property> <property name="name">Code_Taxon</property> <property name="dataType">integer</property> </structure> <structure> - <property name="position">10</property> + <property name="position">9</property> <property name="name">Nom_scientifique</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">11</property> + <property name="position">10</property> <property name="name">Commentaire</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">12</property> + <property name="position">11</property> <property name="name">V_HV</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">13</property> + <property name="position">12</property> <property name="name">Num_Ordre_V_HV_H2</property> <property name="dataType">integer</property> </structure> <structure> - <property name="position">14</property> + <property name="position">13</property> <property name="name">Tot_V_HV</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">15</property> + <property name="position">14</property> <property name="name">Ech_V_HV</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">16</property> + <property name="position">15</property> <property name="name">Type_Volume_Poids_V_HV</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">17</property> + <property name="position">16</property> <property name="name">Unite_Volume_Poids_V_HV</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">18</property> + <property name="position">17</property> <property name="name">Class_Tri_</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">19</property> + <property name="position">18</property> <property name="name">Num_Ordre_Class_Tri__H2</property> <property name="dataType">integer</property> </structure> <structure> - <property name="position">20</property> + <property name="position">19</property> <property name="name">Tot_Class_Tri_</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">21</property> + <property name="position">20</property> <property name="name">Ech_Class_Tri_</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">22</property> + <property name="position">21</property> <property name="name">Type_Volume_Poids_Class_Tri_</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">23</property> + <property name="position">22</property> <property name="name">Unite_Volume_Poids_Class_Tri_</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">24</property> + <property name="position">23</property> <property name="name">Sexe</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">25</property> + <property name="position">24</property> <property name="name">Num_Ordre_Sexe_H2</property> <property name="dataType">integer</property> </structure> <structure> - <property name="position">26</property> + <property name="position">25</property> <property name="name">Tot_Sexe</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">27</property> + <property name="position">26</property> <property name="name">Ech_Sexe</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">28</property> + <property name="position">27</property> <property name="name">Type_Volume_Poids_Sexe</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">29</property> + <property name="position">28</property> <property name="name">Unite_Volume_Poids_Sexe</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">30</property> + <property name="position">29</property> <property name="name">Maturité</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">31</property> + <property name="position">30</property> <property name="name">Num_Ordre_Maturité_H2</property> <property name="dataType">integer</property> </structure> <structure> - <property name="position">32</property> + <property name="position">31</property> <property name="name">Tot_Maturité</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">33</property> + <property name="position">32</property> <property name="name">Ech_Maturité</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">34</property> + <property name="position">33</property> <property name="name">Type_Volume_Poids_Maturité</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">35</property> + <property name="position">34</property> <property name="name">Unite_Volume_Poids_Maturité</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">36</property> + <property name="position">35</property> <property name="name">Age</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">37</property> + <property name="position">36</property> <property name="name">Num_Ordre_Age_H2</property> <property name="dataType">integer</property> </structure> <structure> - <property name="position">38</property> + <property name="position">37</property> <property name="name">Tot_Age</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">39</property> + <property name="position">38</property> <property name="name">Ech_Age</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">40</property> + <property name="position">39</property> <property name="name">Type_Volume_Poids_Age</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">41</property> + <property name="position">40</property> <property name="name">Unite_Volume_Poids_Age</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">42</property> + <property name="position">41</property> <property name="name">Code_Longueur</property> <property name="dataType">integer</property> </structure> <structure> - <property name="position">43</property> + <property name="position">42</property> <property name="name">Libelle_Longueur</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">44</property> + <property name="position">43</property> <property name="name">Taille</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">45</property> + <property name="position">44</property> <property name="name">NumOrdre_Taille_H2</property> <property name="dataType">integer</property> </structure> <structure> - <property name="position">46</property> + <property name="position">45</property> <property name="name">Poids_Classe_Taille</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">47</property> + <property name="position">46</property> <property name="name">Unite_Taille</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">48</property> + <property name="position">47</property> <property name="name">Precision_Mesure</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">49</property> + <property name="position">48</property> <property name="name">Nbr</property> <property name="dataType">integer</property> </structure> <structure> - <property name="position">50</property> + <property name="position">49</property> <property name="name">Poids_Reference</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">51</property> + <property name="position">50</property> <property name="name">Coef_Elev_Espece_Capture</property> <property name="dataType">decimal</property> </structure> <structure> - <property name="position">52</property> + <property name="position">51</property> <property name="name">categorisation-du-lot</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">53</property> + <property name="position">52</property> <property name="name">species-Id</property> <property name="dataType">integer</property> </structure> <structure> - <property name="position">54</property> + <property name="position">53</property> <property name="name">species-Code_Rubin</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">55</property> + <property name="position">54</property> <property name="name">species-Nom Scientifique</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">56</property> + <property name="position">55</property> <property name="name">species-Code campagne</property> <property name="dataType">string</property> </structure> <structure> - <property name="position">57</property> + <property name="position">56</property> <property name="name">species-lib</property> <property name="dataType">string</property> </structure> @@ -6516,24 +6397,6 @@ <property name="dataType">decimal</property> </structure> <structure> - <property name="name">Ouv_Verticale</property> - <text-property name="displayName">Ouv_Verticale</text-property> - <expression name="expression" type="javascript">dataSetRow["Ouv_Verticale"]</expression> - <property name="dataType">string</property> - </structure> - <structure> - <property name="name">Ouv_Horizontale_Ailes</property> - <text-property name="displayName">Ouv_Horizontale_Ailes</text-property> - <expression name="expression" type="javascript">dataSetRow["Ouv_Horizontale_Ailes"]</expression> - <property name="dataType">string</property> - </structure> - <structure> - <property name="name">Ouv_Horizontale_Panneaux</property> - <text-property name="displayName">Ouv_Horizontale_Panneaux</text-property> - <expression name="expression" type="javascript">dataSetRow["Ouv_Horizontale_Panneaux"]</expression> - <property name="dataType">string</property> - </structure> - <structure> <property name="name">Saisisseur</property> <text-property name="displayName">Saisisseur</text-property> <expression name="expression" type="javascript">dataSetRow["Saisisseur"]</expression> @@ -7323,7 +7186,7 @@ </text-data> </cell> </row> - <row id="2963"> + <!--row id="2963"> <cell id="2964"> <label id="2965"> <property name="style">label-general</property> @@ -7336,7 +7199,7 @@ <property name="resultSetColumn">Navire</property> </data> </cell> - </row> + </row--> <row id="2967"> <cell id="2968"> <label id="2969"> @@ -7382,7 +7245,7 @@ </grid> </cell> </row> - <row id="2979"> + <!--row id="2979"> <cell id="2980"> <label id="2981"> <property name="style">label-sous-title</property> @@ -7436,7 +7299,7 @@ </row> </grid> </cell> - </row> + </row--> <row id="2996"> <cell id="2997"> <label id="2998"> @@ -8279,17 +8142,22 @@ <expression name="expression">dataSetRow["Poche"]</expression> <property name="dataType">string</property> </structure> - <structure> + <!--structure> <property name="name">Navire</property> <expression name="expression">dataSetRow["Navire"]</expression> <property name="dataType">string</property> - </structure> + </structure--> <structure> <property name="name">Code_Taxon</property> <expression name="expression">dataSetRow["Code_Taxon"]</expression> <property name="dataType">integer</property> </structure> <structure> + <property name="name">Code_Espece_Campagne</property> + <expression name="expression">dataSetRow["Code_Espece_Campagne"]</expression> + <property name="dataType">string</property> + </structure> + <structure> <property name="name">Nom_scientifique</property> <expression name="expression">dataSetRow["Nom_scientifique"]</expression> <property name="dataType">string</property> @@ -8500,6 +8368,11 @@ <property name="dataType">decimal</property> </structure> <structure> + <property name="name">Coef_Final_Elevation</property> + <expression name="expression">dataSetRow["Coef_Final_Elevation"]</expression> + <property name="dataType">decimal</property> + </structure> + <structure> <property name="name">sumNbr</property> <property name="dataType">float</property> <simple-property-list name="aggregateOn"> @@ -10444,11 +10317,11 @@ <expression name="expression">dataSetRow["Poche"]</expression> <property name="dataType">string</property> </structure> - <structure> + <!--structure> <property name="name">Navire</property> <expression name="expression">dataSetRow["Navire"]</expression> <property name="dataType">string</property> - </structure> + </structure--> <structure> <property name="name">MarineLitterCategory</property> <expression name="expression">dataSetRow["MarineLitterCategory"]</expression> @@ -10641,11 +10514,11 @@ <expression name="expression">dataSetRow["Poche"]</expression> <property name="dataType">string</property> </structure> - <structure> + <!--structure> <property name="name">Navire</property> <expression name="expression">dataSetRow["Navire"]</expression> <property name="dataType">string</property> - </structure> + </structure--> <structure> <property name="name">BatchId</property> <expression name="expression">dataSetRow["BatchId"]</expression>