diff --git a/doc/gitlab-markdown.gpp b/doc/gitlab-markdown.gpp
index 4ef53491937e99ed1d23e42b0b27624ded27071c..4d1e75491898edd3775e787229682d9dcb7a8b28 100644
--- a/doc/gitlab-markdown.gpp
+++ b/doc/gitlab-markdown.gpp
@@ -8,6 +8,16 @@
</figure>
}
+!!define{!!pdf{description}{filename}}{}
+
+!!define{!!pdfref{ref_id}{description}{filename}}{
+<figure>
+<a name="!!ref_id"/>
+!!pdf{!!description}{!!filename}
+<figcaption>!!description</figcaption>
+</figure>
+}
+
!!define{!!ref{ref_id}}{}
!!define{!!video{description}{filename}}{}
diff --git a/doc/images/planning.pdf b/doc/images/planning.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..feb43ec11dc8d24dda390efb1d2bdd40ab3772ac
Binary files /dev/null and b/doc/images/planning.pdf differ
diff --git a/doc/images/planning.png b/doc/images/planning.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c1300a4ae15ffeff0f38091e5cd33e2512cfe83
--- /dev/null
+++ b/doc/images/planning.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e1ff91ad99219c368059e56db038a04662616b31fdce0be89ddf9a536e30bd3c
+size 26136
diff --git a/doc/pandoc-pdf-markdown.gpp b/doc/pandoc-pdf-markdown.gpp
index aec4476dda2697ec73b2756a6fe9efb95eab2982..6ee3c9fede19f0b2fdce370bd8a8ad753e6ad112 100644
--- a/doc/pandoc-pdf-markdown.gpp
+++ b/doc/pandoc-pdf-markdown.gpp
@@ -2,6 +2,10 @@
!!define{!!svgref{ref_id}{description}{filename}}{!!svg{!!description\label{!!ref_id}}{!!filename}}
+!!define{!!pdf{description}{filename}}{}
+
+!!define{!!pdfref{ref_id}{description}{filename}}{!!pdf{!!description\label{!!ref_id}}{!!filename}}
+
!!define{!!ref{ref_id}}{\ref{!!ref_id}}
!!define{!!video{description}{filename}}{[!!description](!!filename)}
diff --git a/doc/planning.fods b/doc/planning.fods
index 2b9f262688cc99359910a21ede0e6dbe1dfc21ed..2f208fbd1ef72b9388482d80bff1b712bd4cff08 100644
--- a/doc/planning.fods
+++ b/doc/planning.fods
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ooo="http://openoffice.org/2004/office" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
- <office:meta><meta:creation-date>2020-04-29T09:17:45.829856153</meta:creation-date><dc:date>2020-04-29T14:35:47.623616846</dc:date><meta:editing-duration>PT3H35M20S</meta:editing-duration><meta:editing-cycles>6</meta:editing-cycles><meta:generator>LibreOffice/6.4.3.2$Linux_X86_64 LibreOffice_project/40$Build-2</meta:generator><meta:document-statistic meta:table-count="1" meta:cell-count="72" meta:object-count="0"/></office:meta>
+<office:document xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:ooo="http://openoffice.org/2004/office" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+ <office:meta><meta:creation-date>2020-04-29T09:17:45.829856153</meta:creation-date><dc:date>2020-08-13T23:04:42.778367616</dc:date><meta:editing-duration>PT3H38M16S</meta:editing-duration><meta:editing-cycles>7</meta:editing-cycles><meta:generator>LibreOffice/6.4.5.2$Linux_X86_64 LibreOffice_project/40$Build-2</meta:generator><meta:document-statistic meta:table-count="1" meta:cell-count="72" meta:object-count="0"/></office:meta>
<office:settings>
<config:config-item-set config:name="ooo:view-settings">
<config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
<config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
<config:config-item config:name="VisibleAreaWidth" config:type="int">36634</config:config-item>
- <config:config-item config:name="VisibleAreaHeight" config:type="int">25287</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">30354</config:config-item>
<config:config-item-map-indexed config:name="Views">
<config:config-item-map-entry>
<config:config-item config:name="ViewId" config:type="string">view1</config:config-item>
<config:config-item-map-named config:name="Tables">
<config:config-item-map-entry config:name="Sheet1">
- <config:config-item config:name="CursorPositionX" config:type="int">9</config:config-item>
- <config:config-item config:name="CursorPositionY" config:type="int">5</config:config-item>
+ <config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item>
+ <config:config-item config:name="CursorPositionY" config:type="int">12</config:config-item>
<config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item>
<config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item>
<config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item>
@@ -32,7 +32,7 @@
</config:config-item-map-entry>
</config:config-item-map-named>
<config:config-item config:name="ActiveTable" config:type="string">Sheet1</config:config-item>
- <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1651</config:config-item>
+ <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1311</config:config-item>
<config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
<config:config-item config:name="ZoomValue" config:type="int">100</config:config-item>
<config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item>
@@ -61,37 +61,38 @@
<config:config-item config:name="EmbedComplexScriptFonts" config:type="boolean">true</config:config-item>
<config:config-item config:name="EmbedAsianScriptFonts" config:type="boolean">true</config:config-item>
<config:config-item config:name="EmbedLatinScriptFonts" config:type="boolean">true</config:config-item>
- <config:config-item config:name="IsDocumentShared" config:type="boolean">false</config:config-item>
- <config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item>
<config:config-item config:name="EmbedOnlyUsedFonts" config:type="boolean">false</config:config-item>
- <config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item>
- <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item>
- <config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item>
- <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item>
- <config:config-item config:name="RasterIsVisible" config:type="boolean">false</config:config-item>
- <config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item>
- <config:config-item config:name="GridColor" config:type="int">12632256</config:config-item>
- <config:config-item config:name="PrinterName" config:type="string"/>
- <config:config-item config:name="EmbedFonts" config:type="boolean">false</config:config-item>
- <config:config-item config:name="IsSnapToRaster" config:type="boolean">false</config:config-item>
- <config:config-item config:name="RasterResolutionX" config:type="int">1270</config:config-item>
<config:config-item config:name="RasterResolutionY" config:type="int">1270</config:config-item>
- <config:config-item config:name="ShowZeroValues" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsOutlineSymbolsSet" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="RasterSubdivisionY" config:type="int">1</config:config-item>
+ <config:config-item config:name="GridColor" config:type="int">12632256</config:config-item>
+ <config:config-item config:name="HasColumnRowHeaders" config:type="boolean">true</config:config-item>
<config:config-item config:name="ShowNotes" config:type="boolean">true</config:config-item>
- <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item>
- <config:config-item config:name="ShowPageBreaks" config:type="boolean">true</config:config-item>
<config:config-item config:name="HasSheetTabs" config:type="boolean">true</config:config-item>
- <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item>
- <config:config-item config:name="LinkUpdateMode" config:type="short">3</config:config-item>
+ <config:config-item config:name="PrinterSetup" config:type="base64Binary">xgH+/0hld2xldHQtUGFja2FyZF9IZXdsZXR0LVBhY2thcmRfSFBfQ29sb3JfTGFzZXJKZXRfQ00xMzEyd2lfTUZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpIZXdsZXR0LVBhY2thcmRfSGV3bGV0dC1QYQAWAAMA5wAAAAAAAAAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9SGV3bGV0dC1QYWNrYXJkX0hld2xldHQtUGFja2FyZF9IUF9Db2xvcl9MYXNlckpldF9DTTEzMTJ3aV9NRlAKb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==</config:config-item>
+ <config:config-item config:name="RasterResolutionX" config:type="int">1270</config:config-item>
+ <config:config-item config:name="SyntaxStringRef" config:type="short">7</config:config-item>
+ <config:config-item config:name="RasterIsVisible" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ShowZeroValues" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item>
<config:config-item config:name="RasterSubdivisionX" config:type="int">1</config:config-item>
- <config:config-item config:name="HasColumnRowHeaders" config:type="boolean">true</config:config-item>
- <config:config-item config:name="RasterSubdivisionY" config:type="int">1</config:config-item>
+ <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item>
<config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item>
- <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
- <config:config-item config:name="IsOutlineSymbolsSet" config:type="boolean">true</config:config-item>
- <config:config-item config:name="PrinterPaperFromSetup" config:type="boolean">false</config:config-item>
- <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EmbedFonts" config:type="boolean">false</config:config-item>
<config:config-item config:name="SaveThumbnail" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrinterName" config:type="string">Hewlett-Packard_Hewlett-Packard_HP_Color_LaserJet_CM1312wi_MFP</config:config-item>
+ <config:config-item config:name="PrinterPaperFromSetup" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item>
+ <config:config-item config:name="LinkUpdateMode" config:type="short">3</config:config-item>
+ <config:config-item config:name="ShowPageBreaks" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsSnapToRaster" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsDocumentShared" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item>
</config:config-item-set>
</office:settings>
<office:scripts>
@@ -204,6 +205,9 @@
<style:table-column-properties fo:break-before="auto" style:column-width="0.889in"/>
</style:style>
<style:style style:name="ro1" style:family="table-row">
+ <style:table-row-properties style:row-height="0.3311in" fo:break-before="auto" style:use-optimal-row-height="false"/>
+ </style:style>
+ <style:style style:name="ro2" style:family="table-row">
<style:table-row-properties style:row-height="0.178in" fo:break-before="auto" style:use-optimal-row-height="true"/>
</style:style>
<style:style style:name="ta1" style:family="table" style:master-page-name="Default">
@@ -212,16 +216,20 @@
<number:number-style style:name="N2">
<number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1"/>
</number:number-style>
- <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N10108">
+ <style:style style:name="ce8" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N10108">
+ <style:table-cell-properties fo:border-bottom="2.49pt solid #000000" fo:border-left="0.06pt solid #000000" fo:border-right="0.74pt solid #000000" fo:border-top="0.06pt solid #000000" style:vertical-align="middle"/>
<style:text-properties fo:font-size="9pt" fo:font-weight="bold" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
</style:style>
- <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N10108">
- <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
+ <style:style style:name="ce9" style:family="table-cell" style:parent-style-name="Default">
+ <style:table-cell-properties fo:border-bottom="0.06pt solid #000000" fo:border-left="0.06pt solid #000000" fo:border-right="0.74pt solid #000000" fo:border-top="0.06pt solid #000000" style:vertical-align="middle"/>
+ </style:style>
+ <style:style style:name="ce10" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N10108">
+ <style:table-cell-properties fo:border-bottom="2.49pt solid #000000" style:text-align-source="fix" style:repeat-content="false" fo:border-left="0.06pt solid #000000" fo:border-right="0.06pt solid #000000" fo:border-top="0.06pt solid #000000" style:vertical-align="middle"/>
<style:paragraph-properties fo:text-align="center" fo:margin-left="0in"/>
<style:text-properties fo:font-size="9pt" fo:font-weight="bold" style:font-size-asian="9pt" style:font-weight-asian="bold" style:font-size-complex="9pt" style:font-weight-complex="bold"/>
</style:style>
- <style:style style:name="ce3" style:family="table-cell" style:parent-style-name="Default">
- <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
+ <style:style style:name="ce11" style:family="table-cell" style:parent-style-name="Default">
+ <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false" fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
<style:paragraph-properties fo:text-align="center" fo:margin-left="0in"/>
<style:map style:condition="cell-content()!=x" style:apply-style-name="Good" style:base-cell-address="Sheet1.B2"/>
</style:style>
@@ -233,17 +241,23 @@
<style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
<style:paragraph-properties fo:text-align="center" fo:margin-left="0in"/>
</style:style>
- <style:style style:name="ce6" style:family="table-cell" style:parent-style-name="Default">
+ <style:style style:name="ce14" style:family="table-cell" style:parent-style-name="Default">
+ <style:table-cell-properties fo:border="0.06pt solid #000000" style:vertical-align="middle"/>
<style:map style:condition="cell-content()!=x" style:apply-style-name="Good" style:base-cell-address="Sheet1.B2"/>
</style:style>
- <style:style style:name="ce7" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N10108"/>
+ <style:style style:name="ce15" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N10108">
+ <style:table-cell-properties style:vertical-align="middle"/>
+ </style:style>
+ <style:style style:name="ce16" style:family="table-cell" style:parent-style-name="Default">
+ <style:table-cell-properties style:vertical-align="middle"/>
+ </style:style>
<style:page-layout style:name="pm1">
- <style:page-layout-properties style:writing-mode="lr-tb"/>
+ <style:page-layout-properties fo:page-width="11.6929in" fo:page-height="8.2681in" style:num-format="1" style:print-orientation="landscape" loext:scale-to-X="1" loext:scale-to-Y="1" style:writing-mode="lr-tb"/>
<style:header-style>
- <style:header-footer-properties fo:min-height="0.2953in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-bottom="0.0984in"/>
+ <style:header-footer-properties fo:min-height="0.3in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-bottom="0.1in"/>
</style:header-style>
<style:footer-style>
- <style:header-footer-properties fo:min-height="0.2953in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0.0984in"/>
+ <style:header-footer-properties fo:min-height="0.3in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0.1in"/>
</style:footer-style>
</style:page-layout>
<style:page-layout style:name="pm2">
@@ -277,7 +291,7 @@
<text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p>
</style:region-left>
<style:region-right>
- <text:p><text:date style:data-style-name="N2" text:date-value="2020-04-29">00/00/0000</text:date>, <text:time>00:00:00</text:time></text:p>
+ <text:p><text:date style:data-style-name="N2" text:date-value="2020-08-13">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="22:35:54.430617800">00:00:00</text:time></text:p>
</style:region-right>
</style:header>
<style:header-left style:display="false"/>
@@ -290,243 +304,240 @@
<office:body>
<office:spreadsheet>
<table:calculation-settings table:automatic-find-labels="false" table:use-regular-expressions="false" table:use-wildcards="true"/>
- <table:table table:name="Sheet1" table:style-name="ta1">
+ <table:table table:name="Sheet1" table:style-name="ta1" table:print-ranges="Sheet1.A1:Sheet1.T13">
<table:table-column table:style-name="co1" table:default-cell-style-name="Default"/>
<table:table-column table:style-name="co2" table:number-columns-repeated="17" table:default-cell-style-name="ce4"/>
<table:table-column table:style-name="co2" table:number-columns-repeated="2" table:default-cell-style-name="Default"/>
<table:table-column table:style-name="co3" table:number-columns-repeated="1004" table:default-cell-style-name="Default"/>
<table:table-row table:style-name="ro1">
- <table:table-cell table:style-name="ce1" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce8" office:value-type="string" calcext:value-type="string">
<text:p>Tâche/Semaine</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-04-20" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-04-20" calcext:value-type="date">
<text:p>17 (avr.)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-04-27" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-04-27" calcext:value-type="date">
<text:p>18 (avr.)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-05-04" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-05-04" calcext:value-type="date">
<text:p>19 (mai)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-05-11" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-05-11" calcext:value-type="date">
<text:p>20 (mai)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-05-18" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-05-18" calcext:value-type="date">
<text:p>21 (mai)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-05-25" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-05-25" calcext:value-type="date">
<text:p>22 (mai)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-06-01" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-06-01" calcext:value-type="date">
<text:p>23 (juin)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-06-08" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-06-08" calcext:value-type="date">
<text:p>24 (juin)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-06-15" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-06-15" calcext:value-type="date">
<text:p>25 (juin)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-06-22" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-06-22" calcext:value-type="date">
<text:p>26 (juin)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-06-29" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-06-29" calcext:value-type="date">
<text:p>27 (juin)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-07-06" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-07-06" calcext:value-type="date">
<text:p>28 (juil.)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-07-13" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-07-13" calcext:value-type="date">
<text:p>29 (juil.)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-07-20" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-07-20" calcext:value-type="date">
<text:p>30 (juil.)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-07-27" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-07-27" calcext:value-type="date">
<text:p>31 (juil.)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-08-03" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-08-03" calcext:value-type="date">
<text:p>32 (août)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-08-10" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-08-10" calcext:value-type="date">
<text:p>33 (août)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-08-17" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-08-17" calcext:value-type="date">
<text:p>34 (août)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce2" office:value-type="date" office:date-value="2020-08-24" calcext:value-type="date">
+ <table:table-cell table:style-name="ce10" office:value-type="date" office:date-value="2020-08-24" calcext:value-type="date">
<text:p>35 (août)</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce7" table:number-columns-repeated="1004"/>
+ <table:table-cell table:style-name="ce15" table:number-columns-repeated="1004"/>
</table:table-row>
<table:table-row table:style-name="ro1">
- <table:table-cell office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string">
<text:p>Reproduction/automatisation du projet existant</text:p>
</table:table-cell>
- <table:table-cell table:number-columns-repeated="3" table:style-name="ce3" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:number-columns-repeated="3" table:style-name="ce11" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="14"/>
- <table:table-cell table:style-name="ce6" table:number-columns-repeated="2"/>
- <table:table-cell table:number-columns-repeated="1004"/>
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="14"/>
+ <table:table-cell table:style-name="ce14" table:number-columns-repeated="2"/>
+ <table:table-cell table:style-name="ce16" table:number-columns-repeated="1004"/>
</table:table-row>
<table:table-row table:style-name="ro1">
- <table:table-cell office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string">
<text:p>Planning</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3"/>
- <table:table-cell table:style-name="ce3" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11"/>
+ <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="15"/>
- <table:table-cell table:style-name="ce6" table:number-columns-repeated="2"/>
- <table:table-cell table:number-columns-repeated="1004"/>
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="15"/>
+ <table:table-cell table:style-name="ce14" table:number-columns-repeated="2"/>
+ <table:table-cell table:style-name="ce16" table:number-columns-repeated="1004"/>
</table:table-row>
<table:table-row table:style-name="ro1">
- <table:table-cell office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string">
<text:p>Etude de l’existant</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="2"/>
- <table:table-cell table:style-name="ce3" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="2"/>
+ <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="14"/>
- <table:table-cell table:style-name="ce6" table:number-columns-repeated="2"/>
- <table:table-cell table:number-columns-repeated="1004"/>
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="14"/>
+ <table:table-cell table:style-name="ce14" table:number-columns-repeated="2"/>
+ <table:table-cell table:style-name="ce16" table:number-columns-repeated="1004"/>
</table:table-row>
<table:table-row table:style-name="ro1">
- <table:table-cell office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string">
<text:p>Images windows</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="3"/>
- <table:table-cell table:number-columns-repeated="2" table:style-name="ce3" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="3"/>
+ <table:table-cell table:number-columns-repeated="2" table:style-name="ce11" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="12"/>
- <table:table-cell table:style-name="ce6" table:number-columns-repeated="2"/>
- <table:table-cell table:number-columns-repeated="1004"/>
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="12"/>
+ <table:table-cell table:style-name="ce14" table:number-columns-repeated="2"/>
+ <table:table-cell table:style-name="ce16" table:number-columns-repeated="1004"/>
</table:table-row>
<table:table-row table:style-name="ro1">
- <table:table-cell office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string">
<text:p>Amélioration du format des images</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="4"/>
- <table:table-cell table:number-columns-repeated="3" table:style-name="ce3" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="4"/>
+ <table:table-cell table:number-columns-repeated="3" table:style-name="ce11" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="10"/>
- <table:table-cell table:style-name="ce6" table:number-columns-repeated="2"/>
- <table:table-cell table:number-columns-repeated="1004"/>
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="10"/>
+ <table:table-cell table:style-name="ce14" table:number-columns-repeated="2"/>
+ <table:table-cell table:style-name="ce16" table:number-columns-repeated="1004"/>
</table:table-row>
<table:table-row table:style-name="ro1">
- <table:table-cell office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string">
<text:p>Rendre le processus de création d’images facile</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="6"/>
- <table:table-cell table:number-columns-repeated="4" table:style-name="ce3" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="6"/>
+ <table:table-cell table:number-columns-repeated="4" table:style-name="ce11" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="7"/>
- <table:table-cell table:style-name="ce6" table:number-columns-repeated="2"/>
- <table:table-cell table:number-columns-repeated="1004"/>
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="7"/>
+ <table:table-cell table:style-name="ce14" table:number-columns-repeated="2"/>
+ <table:table-cell table:style-name="ce16" table:number-columns-repeated="1004"/>
</table:table-row>
<table:table-row table:style-name="ro1">
- <table:table-cell office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string">
<text:p>Personnalisation/configuration d’images</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="8"/>
- <table:table-cell table:number-columns-repeated="4" table:style-name="ce3" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="8"/>
+ <table:table-cell table:number-columns-repeated="4" table:style-name="ce11" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="5"/>
- <table:table-cell table:style-name="ce6" table:number-columns-repeated="2"/>
- <table:table-cell table:number-columns-repeated="1004"/>
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="5"/>
+ <table:table-cell table:style-name="ce14" table:number-columns-repeated="2"/>
+ <table:table-cell table:style-name="ce16" table:number-columns-repeated="1004"/>
</table:table-row>
<table:table-row table:style-name="ro1">
- <table:table-cell office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string">
<text:p>Simplifier gestion du système</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="10"/>
- <table:table-cell table:number-columns-repeated="4" table:style-name="ce3" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="10"/>
+ <table:table-cell table:number-columns-repeated="4" table:style-name="ce11" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="3"/>
- <table:table-cell table:style-name="ce6" table:number-columns-repeated="2"/>
- <table:table-cell table:number-columns-repeated="1004"/>
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="3"/>
+ <table:table-cell table:style-name="ce14" table:number-columns-repeated="2"/>
+ <table:table-cell table:style-name="ce16" table:number-columns-repeated="1004"/>
</table:table-row>
<table:table-row table:style-name="ro1">
- <table:table-cell office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string">
<text:p>Optimisation utilisation réseau</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="12"/>
- <table:table-cell table:number-columns-repeated="3" table:style-name="ce3" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="12"/>
+ <table:table-cell table:number-columns-repeated="3" table:style-name="ce11" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="2"/>
- <table:table-cell table:style-name="ce6" table:number-columns-repeated="2"/>
- <table:table-cell table:number-columns-repeated="1004"/>
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="2"/>
+ <table:table-cell table:style-name="ce14" table:number-columns-repeated="2"/>
+ <table:table-cell table:style-name="ce16" table:number-columns-repeated="1004"/>
</table:table-row>
<table:table-row table:style-name="ro1">
- <table:table-cell office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string">
<text:p>Rapport</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="2"/>
- <table:table-cell table:style-name="ce3" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="2"/>
+ <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3"/>
- <table:table-cell table:style-name="ce3" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11"/>
+ <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3"/>
- <table:table-cell table:style-name="ce3" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11"/>
+ <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3"/>
- <table:table-cell table:number-columns-repeated="2" table:style-name="ce3" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11"/>
+ <table:table-cell table:number-columns-repeated="2" table:style-name="ce11" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3"/>
- <table:table-cell table:number-columns-repeated="6" table:style-name="ce3" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11"/>
+ <table:table-cell table:number-columns-repeated="6" table:style-name="ce11" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce6" table:number-columns-repeated="2"/>
- <table:table-cell table:number-columns-repeated="1004"/>
+ <table:table-cell table:style-name="ce14" table:number-columns-repeated="2"/>
+ <table:table-cell table:style-name="ce16" table:number-columns-repeated="1004"/>
</table:table-row>
<table:table-row table:style-name="ro1">
- <table:table-cell office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string">
<text:p>Poster</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="17"/>
- <table:table-cell table:number-columns-repeated="2" table:style-name="ce6" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="17"/>
+ <table:table-cell table:number-columns-repeated="2" table:style-name="ce14" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:number-columns-repeated="1004"/>
+ <table:table-cell table:style-name="ce16" table:number-columns-repeated="1004"/>
</table:table-row>
<table:table-row table:style-name="ro1">
- <table:table-cell office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce9" office:value-type="string" calcext:value-type="string">
<text:p>Slides</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce3" table:number-columns-repeated="17"/>
- <table:table-cell table:number-columns-repeated="2" table:style-name="ce6" office:value-type="string" calcext:value-type="string">
+ <table:table-cell table:style-name="ce11" table:number-columns-repeated="17"/>
+ <table:table-cell table:number-columns-repeated="2" table:style-name="ce14" office:value-type="string" calcext:value-type="string">
<text:p>x</text:p>
</table:table-cell>
- <table:table-cell table:number-columns-repeated="1004"/>
- </table:table-row>
- <table:table-row table:style-name="ro1" table:number-rows-repeated="20">
- <table:table-cell table:number-columns-repeated="1024"/>
+ <table:table-cell table:style-name="ce16" table:number-columns-repeated="1004"/>
</table:table-row>
- <table:table-row table:style-name="ro1" table:number-rows-repeated="22">
+ <table:table-row table:style-name="ro2" table:number-rows-repeated="42">
<table:table-cell table:number-columns-repeated="1024"/>
</table:table-row>
- <table:table-row table:style-name="ro1">
+ <table:table-row table:style-name="ro2">
<table:table-cell table:number-columns-repeated="11"/>
<table:table-cell table:style-name="ce5"/>
<table:table-cell table:number-columns-repeated="1012"/>
</table:table-row>
- <table:table-row table:style-name="ro1" table:number-rows-repeated="1048519">
+ <table:table-row table:style-name="ro2" table:number-rows-repeated="1048519">
<table:table-cell table:number-columns-repeated="1024"/>
</table:table-row>
- <table:table-row table:style-name="ro1">
+ <table:table-row table:style-name="ro2">
<table:table-cell table:number-columns-repeated="1024"/>
</table:table-row>
<calcext:conditional-formats>
@@ -536,6 +547,9 @@
</calcext:conditional-formats>
</table:table>
<table:named-expressions/>
+ <table:database-ranges>
+ <table:database-range table:name="__Anonymous_Sheet_DB__0" table:target-range-address="Sheet1.A1:Sheet1.T13"/>
+ </table:database-ranges>
</office:spreadsheet>
</office:body>
</office:document>
\ No newline at end of file
diff --git a/doc/rapport.gpp.md b/doc/rapport.gpp.md
index b1fe5a9ad8aefe77712a9d4c5bad9db46e7c895c..fbb174e6e2fcb38ffe1259de949dff372364d504 100644
--- a/doc/rapport.gpp.md
+++ b/doc/rapport.gpp.md
@@ -184,7 +184,12 @@ spécifications de ces ordinateurs sont définies dans la table
## Méthodologie
-Le travail a été découpé en
+Le travail a été découpé en plusieurs parties, dont la durée a été
+estimée en semaines de travail. Un planning a été effectué sous la forme
+d'un diagramme de Gantt. Ce diagramme est visible dans la figure
+!!ref{planning_gantt}.
+
+!!pdfref{planning_gantt}{Diagramme de Gantt du planning}{images/planning}
# Cas d'utilisation
@@ -222,38 +227,75 @@ fondée en 1999 pour continuer un développement commercial de ce projet
sous le nom de _Rembo_. En 2006, la société a été rachetée par IBM et le
projet a été intégré à leur solution _Tivoli Provisionning Manager_.
-Bien que ce système réponde aux besoins, sa licence couteuse et sa
-complexité sont problématiques pour une utilisation à !!acronym{HEPIA}.
+Ce système réponde aux besoins de !!acronym{HEPIA}, et il a même déjà
+été utilisé au sein de l'institution par le passé. Il a cependant été
+abandonné à cause de sa licence devenue très couteuse et de sa
+complexité devenue trop grande pour les besoins simple de l'école.
Le développement d'une solution alternative _open-source_ plus simple et
-se basant sur des briques logicielles existantes a donc tout son
-intérêt.
+se basant sur des briques logicielles existantes serait donc très
+intéressante.
## !!acronym{FOG} project
+!!acronym{FOG} est une solution open-source gratuite permettant de
+déployer des images de systèmes d'exploitation sur des postes clients.
-**TODO: expliquer le fonctionnement et les cas d'utilisation de fog,
-l'utilisation actuelle de ce système dans l'école, de ses limitations et
-pourquoi il ne permet pas de répondre aux objectifs de ce projet.**
-
-## Clonezilla
+Elle fonctionne avec une architecture client-serveur. Le serveur est
+accédé par une interface web, où un administrateur peut gérer ses images
+et les déployer sur des clients qui démarrent un logiciel de déploiement
+avec !!acronym{PXE}.
-**TODO: expliquer le fonctionnement, les cas d'utilisation le contexte.
-Parler de l'outil partclone et de ses avantages. Expliquer pourquoi il
-n'est pas adapté tel quel, mais aussi pourquoi il est intéressant de
-réutiliser certaines parties.**
+Cette solution est utilisées dans certaines classes à !!acronym{HEPIA}
+pour déployer des images sur certains postes, notemment pour les travaux
+de laboratoire de réseau.
-## Ghost
+Malheureusement, ce système ne répond pas exactement au cahier des
+charges de ce projet: il est plutôt conçu pour "pousser" des images sur
+des clients, depuis le serveur, après une initiation du déploiement par
+un administrateur. Nous souhaitons plutôt un système ne nécessitant pas
+d'intervention d'un administrateur pour initier un déploiement.
-**TODO: expliquer le fonctionnement et mettre en parallèle à fog et
-clonezilla et souligner les problématiques d'une solution commerciale au
-lieu d'une solution open-source. **
+De plus,!!acronym{FOG} ne dispose pas de mécanisme de cache sur les
+clients permettant de ne pas télécharger les images plusieurs fois. À
+chaque fois qu'un image doit être déployée, elle doit être téléchargée à
+nouveau depuis le serveur, ce qui peut prendre beaucoup de temps et doit
+être planifié à l'avance.
-## Acronis TrueImage
+## Clonezilla
-**TODO: expliquer le fonctionnement et mettre en parallèle à fog et
-clonezilla et souligner les problématiques d'une solution commerciale au
-lieu d'une solution open-source. **
+_Clonezilla_ est une solution open-source et gratuite de création et de
+restauration d'images.
+
+Cet outil peut être utilisé de deux manières:
+
+- En faisant démarrer les clients sur le réseau. Ils chargent un petit
+ système d'exploitation de déploiement depuis un un serveur
+ !!acronym{PXE}. Ils peuvent ensuite initier le déploiement ou la
+ restauration d'une image depuis/vers ce serveur.
+- En faisant démarrer les clients sur un CD ou une clé USB. Ils peuvent
+ ensuite initier le déploiement ou la restauration d'une image
+ d'!!acronym{OS} depuis/vers sur un autre disque ou un serveur distant.
+
+Un avantage de _Clonezilla_ est le format utilisé pour la sauvegarde des
+images. L'outil _Partclone_, développé par la même équipe, est utilisé.
+Il permet de créer des images de partitions en ne copiant que les blocs
+utilisés dans le système de fichiers. Les parties non utilisées de la
+partition ne sont pas comprises dans l'image créée, ce qui permet de
+réduire sa taille et d'accélérer le processus de sauvegarde et de
+restauration.
+
+Malheureusement, comme pour !!acronym{FOG}, _Clonezilla_ ne dispose pas
+de mécanisme de cache sur les clients permettant de ne pas télécharger
+les images depuis un serveur distant plusieurs fois. À chaque fois qu'un
+image doit être déployée, elle doit être téléchargée à nouveau depuis le
+serveur, ce qui peut prendre beaucoup de temps et doit être planifié à
+l'avance.
+
+_Clonezilla_ ne peut donc pas être utilisé tel-quel. Cependant, il est
+possible de l'utiliser uniquement pour la création d'images et
+d'intégrer son mécanisme de restauration à un autre système de
+déploiement. Cette possibilité sera étudiée plus tard dans ce document.
# Architecture initiale du projet
diff --git a/doc/rapport.md b/doc/rapport.md
index 73ca5ae8a37893dcd3aa1d9f18848bc2aa998179..a9e6fcd8a75d7c5de7c348cf29fd1b015f1cc2a2 100644
--- a/doc/rapport.md
+++ b/doc/rapport.md
@@ -126,7 +126,7 @@ d’un travail déjà existant.
## Déroulement
-Ce projet n'e pas n'a pas été réalisé dans les locaux d'<abbr title="Haute école du paysage, d’ingénierie et d’architecture de Genève ">HEPIA</abbr>
+Ce projet n'a pas n'a pas été réalisé dans les locaux d'<abbr title="Haute école du paysage, d’ingénierie et d’architecture de Genève ">HEPIA</abbr>
mais à distance, depuis la maison, en partie à cause de la situation
sanitaire due au COVID-19 mais aussi parce qu'il est effectué dans le
cadre d'un bachelor en cours du soir, en parallèle à une activité
@@ -159,6 +159,19 @@ Spécifications techniques des ordinateurs mis à disposition: <a name="mini_pc_
## Méthodologie
+Le travail a été découpé en plusieurs parties, dont la durée a été
+estimée en semaines de travail. Un planning a été effectué sous la forme
+d'un diagramme de Gantt. Ce diagramme est visible dans la figure
+.
+
+
+<figure>
+<a name="planning_gantt"/>
+
+<figcaption>Diagramme de Gantt du planning</figcaption>
+</figure>
+
+
# Cas d'utilisation
L'aspect fonctionnel du système à réaliser est décrit avec un diagramme
diff --git a/doc/rapport.pdf b/doc/rapport.pdf
index ad2c6e9cb1a3d54d07e5982e1fca790669b3a364..75a6e541c6307c1ef0fa615d9030f7fc7bbdc28e 100644
Binary files a/doc/rapport.pdf and b/doc/rapport.pdf differ