Skip to content

Commit b639a60

Browse files
committed
update
Generale: +riformattata la navbar laterale, aggiungendo i link ai vari Sprint (consigliato dal prof) +spostati stili e script in una directory in common, così si fa riferimento a quelli per tutti gli sprint; +sistemata la tabella del team; Sprint0: +cambiato il modello QAK dell'overview generale con la nuova versione del prof (ora ci sono le reply); +sistemate le conclusioni, in cui spieghiamo gli argomenti dei prossimi sprint; +aggiunta motivazione delle priorità (sia in analisi dei requisiti, che in conclusioni) Sprint1: +fatto scheletro dello sprint TO-DO: finire il template per gli sprint TO-DO Sprint1: +partire con l'intro e il Goal (la intro poi potremmo specificarla meglio più avanti)
1 parent 4d3637f commit b639a60

File tree

118 files changed

+3054
-937
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+3054
-937
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,6 @@
2222
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
2323
hs_err_pid*
2424

25-
Sprint0/Sprint0_ProblemAnalysis/
25+
#tmp
26+
Sprint2*/
27+
Sprint3*/
Loading

Sprint0/index.html

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,19 @@
33
<head>
44
<title>Sprint0</title>
55
<meta name="viewport" content="width=device-width, initial-scale=1">
6-
<link rel="stylesheet" type="text/css" href="resources/styles/templateISS.css">
7-
<link rel="stylesheet" type="text/css" href="resources/styles/main.css">
8-
<link rel="stylesheet" type="text/css" href="resources/styles/navbar.css">
9-
<link rel="stylesheet" type="text/css" href="resources/styles/table.css">
10-
<script type="text/javascript" src="resources/scripts/myScripts.js"></script>
6+
<link rel="stylesheet" type="text/css" href="../commons/resources/styles/templateISS.css">
7+
<link rel="stylesheet" type="text/css" href="../commons/resources/styles/main.css">
8+
<link rel="stylesheet" type="text/css" href="../commons/resources/styles/navbar.css">
9+
<link rel="stylesheet" type="text/css" href="../commons/resources/styles/table.css">
10+
<link rel="stylesheet" type="text/css" href="../commons/resources/styles/code.css">
11+
<script type="text/javascript" src="../commons/resources/scripts/myScripts.js"></script>
1112
</head>
1213

1314
<body onload="loadNav();">
1415
<div id="openButton" class="openButton" onclick="openNav(true)">&#9776; Menu</div>
1516
<div id="sidenav" class="sidenav">
1617
<a class="closeButton" href="javascript:void(0)" onclick="closeNav(true)">&times;</a>
18+
<a id="currentSprint" class="sprint" href="#">&#8211;&#8212; Sprint0 &#8212;&#8211;</a>
1719
<a class="selected" href="#">Index</a>
1820
<div class="sidenavSection">
1921
<a href="#Introduction">Introduction</a>
@@ -23,8 +25,14 @@
2325
<a href="resources/userDocs/final_theme.html">Final Theme</a>
2426
<a href="resources/userDocs/requirement_analysis.html">Requirement<br/>Analysis</a>
2527
<a href="resources/userDocs/problem_analysis.html">Problem Analysis</a>
28+
<a href="resources/userDocs/project.html">Project</a>
2629
<a href="resources/userDocs/conclusions.html">Conclusions</a>
2730
<a href="resources/userDocs/team.html">Team</a>
31+
<p class="separator">&mdash;&mdash;&mdash;&ndash;&ndash;&mdash;&mdash;&mdash;</p>
32+
<a class="sprint" href="../Sprint1/index.html">Sprint1</a>
33+
<a class="sprint" href="../Sprint2/index.html">Sprint2</a>
34+
<a class="sprint" href="../Sprint3/index.html">Sprint3</a>
35+
<bottom-spacer/>
2836
</div>
2937

3038
<div id="main">
Loading

Sprint0/resources/userDocs/conclusions.html

Lines changed: 44 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,24 @@
22
<html>
33
<head>
44
<title>Sprint0</title>
5-
<link rel="stylesheet" type="text/css" href="../styles/templateISS.css">
6-
<link rel="stylesheet" type="text/css" href="../styles/main.css">
7-
<link rel="stylesheet" type="text/css" href="../styles/navbar.css">
8-
<link rel="stylesheet" type="text/css" href="../styles/table.css">
9-
<script type="text/javascript" src="../scripts/myScripts.js"></script>
10-
11-
<style>
12-
13-
table {
14-
border-style: hidden;
15-
border-collapse: collapse;
16-
border-radius: 25px;
17-
background-color: #9ed8ff;
18-
}
19-
20-
</style>
5+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/templateISS.css">
6+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/main.css">
7+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/navbar.css">
8+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/table.css">
9+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/code.css">
10+
<script type="text/javascript" src="../../../commons/resources/scripts/myScripts.js"></script>
2111
</head>
2212

23-
<body onload="loadNav();"> <!--setLastModifiedDate();">-->
13+
<body onload="loadNav();">
2414
<div id="openButton" class="openButton" onclick="openNav(true)">&#9776; Menu</div>
2515
<div id="sidenav" class="sidenav">
2616
<a class="closeButton" href="javascript:void(0)" onclick="closeNav(true)">&times;</a>
17+
<a id="currentSprint" class="sprint" href="#">&#8211;&#8212; Sprint0 &#8212;&#8211;</a>
2718
<a href="../../index.html">Index</a>
2819
<a href="final_theme.html">Final Theme</a>
2920
<a href="requirement_analysis.html">Requirement<br/>Analysis</a>
3021
<a href="problem_analysis.html">Problem Analysis</a>
22+
<a href="project.html">Project</a>
3123
<a class="selected" href="conclusions.html">Conclusions</a>
3224
<div class="sidenavSection">
3325
<a href="#Summary">Summary</a>
@@ -39,36 +31,59 @@
3931
</div>
4032
</div>
4133
<a href="team.html">Team</a>
34+
<p class="separator">&mdash;&mdash;&mdash;&ndash;&ndash;&mdash;&mdash;&mdash;</p>
35+
<a class="sprint" href="../../../Sprint1/index.html">Sprint1</a>
36+
<a class="sprint" href="../../../Sprint2/index.html">Sprint2</a>
37+
<a class="sprint" href="../../../Sprint3/index.html">Sprint3</a>
38+
<bottom-spacer/>
4239
</div>
4340

4441
<div id="main">
4542
<h1 align="center">Sprint Conclusions</h1>
4643

4744
<h2 id="Summary">Summary</h2>
48-
49-
This first Sprint (<a href="../../index.html">Sprint0</a>) outlined the following macro elements of the project:
45+
This first Sprint (<a href="../../index.html">Sprint0</a>) grouped the requirements of
46+
the project, by outlining the following <b>macro components</b>, ordered by priority:
5047
<div class="remark">
51-
<ol>
52-
<li><ksi>Core-business</ksi>: involves the chain of the main nodes of the system (smart device, waste service, transport trolley, basic robot)</li>
53-
<li><ksi>Monitoring</ksi>: involves the GUI</li>
54-
<li><ksi>Alarm</ksi>: involves the raspberry device</li>
48+
<ol class="summary">
49+
<li>
50+
<ksi>Core-business</ksi> (requirements <b>1 & 2</b>): involves the chain of
51+
the main nodes of the system (smart device, waste service, transport trolley,
52+
basic robot).
53+
<br/>
54+
<emni>High priority</emni> since the system cannot provide the service without it.
55+
</li>
56+
<li>
57+
<ksi>RaspberryPi</ksi> (requirement <b>4</b>): includes alarm (sonar)
58+
and warning (led) elements.
59+
<br/>
60+
<emni>Medium priority</emni> since it involves the security of the service.
61+
</li>
62+
<li>
63+
<ksi>Monitoring</ksi> (requirement <b>3</b>): involves the GUI that display
64+
information on the current status of the service.
65+
<br/>
66+
<emni>Low priority</emni> since it can be seen as a <i>secondary, fancier and remote output</i>
67+
(in addition to the textual output), and depends on the other 2 components.
68+
</li>
5569
</ol>
5670
</div>
5771

5872
<h2 id="Work-Plan">Work Plan</h2>
59-
<h3 id="Sprint1">Sprint1 - <b>Core Business</b></h3>
73+
We decided to partition the system into <b>3 sprints</b>, which follows the macro components mentioned above.
74+
<h3 id="Sprint1"><b>Sprint1</b> - Core Business</h3>
6075

61-
The <a href="">Sprint1</a> will focus on the <i>Core business</i>, which is also the first requirement, and is going to include:
76+
The <a href="../../../Sprint1/index.html">Sprint1</a> will focus on the <i>Core business</i>, which is also the first requirement, and is going to include:
6277
<ul>
63-
<li>Dummy simulator of TruckDriver + SmartDevice.</li>
64-
<li>WasteService: problem analysis regarding a model for "advanced" interactions, waste service area in-depth analysis, project and implementation of a prototype.</li>
78+
<li>Dummy simulator of TruckDriver + SmartDevice (with a test GUI).</li>
79+
<li>WasteService: problem analysis including a model for "advanced" interactions, waste service area in-depth analysis, project and implementation of a prototype.</li>
6580
<li>TransportTrolley: problem analysis, project and prototyping of the element that will control the robot movements.</li>
6681
<li>BasicRobot: the software is ready and serviceable, so it just has to be integrated in the project.</li>
6782
</ul>
6883

69-
<h3 id="Sprint2">Sprint2 - <b>Monitoring</b></h3>
84+
<h3 id="Sprint2"><b>Sprint2</b> - Alarm</h3>
7085

71-
<h3 id="Sprint3">Sprint3 - <b>Alarm</b></h3>
86+
<h3 id="Sprint3"><b>Sprint3</b> - Monitoring</h3>
7287
<br/>
7388
<br/>
7489
<!--Tenere presente che per la realizzazione dei prodotti, potranno essere utilizzate o specializzate le applicazioni realizzate dalla nostra software house, nel corso dell'anno corrente: Applicazioni22.-->

Sprint0/resources/userDocs/final_theme.html

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22
<html>
33
<head>
44
<title>Sprint0</title>
5-
<link rel="stylesheet" type="text/css" href="../styles/templateISS.css">
6-
<link rel="stylesheet" type="text/css" href="../styles/main.css">
7-
<link rel="stylesheet" type="text/css" href="../styles/navbar.css">
8-
<link rel="stylesheet" type="text/css" href="../styles/table.css">
9-
<script type="text/javascript" src="../scripts/myScripts.js"></script>
5+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/templateISS.css">
6+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/main.css">
7+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/navbar.css">
8+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/table.css">
9+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/code.css">
10+
<script type="text/javascript" src="../../../commons/resources/scripts/myScripts.js"></script>
1011
</head>
1112

1213
<body onload="return loadNav();">
1314
<div id="openButton" class="openButton" onclick="openNav(true)">&#9776; Menu</div>
1415
<div id="sidenav" class="sidenav">
1516
<a class="closeButton" href="javascript:void(0)" onclick="closeNav(true)">&times;</a>
17+
<a id="currentSprint" class="sprint" href="#">&#8211;&#8212; Sprint0 &#8212;&#8211;</a>
1618
<a href="../../index.html">Index</a>
1719
<a class="selected" href="final_theme.html">Final Theme</a>
1820
<div class="sidenavSection">
@@ -32,8 +34,14 @@
3234
</div>
3335
<a href="requirement_analysis.html">Requirement<br/>Analysis</a>
3436
<a href="problem_analysis.html">Problem Analysis</a>
37+
<a href="project.html">Project</a>
3538
<a href="conclusions.html">Conclusions</a>
3639
<a href="team.html">Team</a>
40+
<p class="separator">&mdash;&mdash;&mdash;&ndash;&ndash;&mdash;&mdash;&mdash;</p>
41+
<a class="sprint" href="../../../Sprint1/index.html">Sprint1</a>
42+
<a class="sprint" href="../../../Sprint2/index.html">Sprint2</a>
43+
<a class="sprint" href="../../../Sprint3/index.html">Sprint3</a>
44+
<bottom-spacer/>
3745
</div>
3846

3947
<div id="main">

Sprint0/resources/userDocs/problem_analysis.html

Lines changed: 13 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -2,71 +2,35 @@
22
<html>
33
<head>
44
<title>Sprint0</title>
5-
<link rel="stylesheet" type="text/css" href="../styles/templateISS.css">
6-
<link rel="stylesheet" type="text/css" href="../styles/main.css">
7-
<link rel="stylesheet" type="text/css" href="../styles/navbar.css">
8-
<link rel="stylesheet" type="text/css" href="../styles/table.css">
9-
<link rel="stylesheet" type="text/css" href="../styles/code.css">
10-
<script type="text/javascript" src="../scripts/myScripts.js"></script>
5+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/templateISS.css">
6+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/main.css">
7+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/navbar.css">
8+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/table.css">
9+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/code.css">
10+
<script type="text/javascript" src="../../../commons/resources/scripts/myScripts.js"></script>
1111
</head>
1212

1313
<body onload="loadNav();">
1414
<div id="openButton" class="openButton" onclick="openNav(true)">&#9776; Menu</div>
1515
<div id="sidenav" class="sidenav">
1616
<a class="closeButton" href="javascript:void(0)" onclick="closeNav(true)">&times;</a>
17+
<a id="currentSprint" class="sprint" href="#">&#8211;&#8212; Sprint0 &#8212;&#8211;</a>
1718
<a href="../../index.html">Index</a>
1819
<a href="final_theme.html">Final Theme</a>
1920
<a href="requirement_analysis.html">Requirement<br/>Analysis</a>
2021
<a class="selected" href="problem_analysis.html">Problem Analysis</a>
22+
<a href="project.html">Project</a>
2123
<a href="conclusions.html">Conclusions</a>
2224
<a href="team.html">Team</a>
23-
<p style="height: 100px; visibility: hidden"></p><!-- tmp -->
25+
<p class="separator">&mdash;&mdash;&mdash;&ndash;&ndash;&mdash;&mdash;&mdash;</p>
26+
<a class="sprint" href="../../../Sprint1/index.html">Sprint1</a>
27+
<a class="sprint" href="../../../Sprint2/index.html">Sprint2</a>
28+
<a class="sprint" href="../../../Sprint3/index.html">Sprint3</a>
29+
<bottom-spacer/>
2430
</div>
2531

2632
<div id="main">
2733
<h1 align="center">Problem Analysis</h1>
28-
<!--<h2 id="Service-Area">Service Area</h2>
29-
<highlight2>Forse questa è meglio metterla in uno Sprint# a parte, e per ora descrivere le posizioni a parole</highlight2>
30-
<b>Problem</b>: we need a proper <i>representation</i> of the service area to optimally move and monitor the transport trolley.<br/>
31-
<b>Solution</b>: <ksi>2x2 matrix</ksi>, where each element represents a different position, starting from the top-left corner.<br/>
32-
<b>Reasons</b>:
33-
<ul>
34-
<li>
35-
Since the HOME is the top-left corner, it's more intuitive to represent it as the
36-
first element of the matrix, which is the [0,0] element.
37-
</li>
38-
<li>
39-
We can associate a <b>cartesian coordinate system</b> to the matrix with the origin in the
40-
top-left corner and RD as unit. That might make things easier later on, if we will
41-
need to implement a graphical representation of the transport trolley state
42-
(for example in WasteServiceStatusGUI).
43-
This because almost every software, library, framework or API, start drawing from
44-
the top-left corner to the bottom-right one.
45-
</li>
46-
</ul>
47-
48-
<div class="image-container">
49-
<img id="map" class="base-image" width="100%" src="../../resources/imgs/modello_stanza_v4.png"/>
50-
<img id="map-legend" class="overlay-image1" width="100%" src="../../resources/imgs/modello_stanza_solo_scritte.png"/>
51-
<img id="map-coordinates" class="overlay-image2" width="100%" src="../../resources/imgs/modello_stanza_solo_coordinate.png"/>
52-
</div>
53-
<input type="checkbox" onclick="showOverlay(this, 'map-legend');" checked>Show the legend</input><br/>
54-
<input type="checkbox" onclick="showOverlay(this, 'map-coordinates');" checked>Show the coordinate system</input>
55-
<br/>
56-
<h3 id="Relevant-Positions">Relevant Positions</h3>
57-
The matrix number of rows and columns depend on RD (which is the size of the DDR robot),
58-
therefore for the moment we assume to have an M x N matrix, i.e. with respectively M rows (x axis)
59-
and N columns (y axis).<br/>
60-
<div class="remark">
61-
The relevant positions are:
62-
<ul>
63-
<li>[0,0] = <ks>HOME</ks></li>
64-
<li>from [0,M] to [4,M] = <ks>INDOOR</ks></li>
65-
<li>from [N,0] to [N,4] = <ks>GLASSBOX</ks></li>
66-
<li>from [N,M-4] to [N,M] = <ks>PLASTICBOX</ks></li>
67-
</ul>
68-
</div>-->
69-
7034
</div>
7135

7236
</body>
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
2+
<html>
3+
<head>
4+
<title>Sprint0</title>
5+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/templateISS.css">
6+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/main.css">
7+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/navbar.css">
8+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/table.css">
9+
<link rel="stylesheet" type="text/css" href="../../../commons/resources/styles/code.css">
10+
<script type="text/javascript" src="../../../commons/resources/scripts/myScripts.js"></script>
11+
</head>
12+
13+
<body onload="loadNav();">
14+
<div id="openButton" class="openButton" onclick="openNav(true)">&#9776; Menu</div>
15+
<div id="sidenav" class="sidenav">
16+
<a class="closeButton" href="javascript:void(0)" onclick="closeNav(true)">&times;</a>
17+
<a id="currentSprint" class="sprint" href="#">&#8211;&#8212; Sprint0 &#8212;&#8211;</a>
18+
<a href="../../index.html">Index</a>
19+
<a href="final_theme.html">Final Theme</a>
20+
<a href="requirement_analysis.html">Requirement<br/>Analysis</a>
21+
<a href="problem_analysis.html">Problem Analysis</a>
22+
<a class="selected" href="project.html">Project</a>
23+
<a href="conclusions.html">Conclusions</a>
24+
<a href="team.html">Team</a>
25+
<p class="separator">&mdash;&mdash;&mdash;&ndash;&ndash;&mdash;&mdash;&mdash;</p>
26+
<a class="sprint" href="../../../Sprint1/index.html">Sprint1</a>
27+
<a class="sprint" href="../../../Sprint2/index.html">Sprint2</a>
28+
<a class="sprint" href="../../../Sprint3/index.html">Sprint3</a>
29+
<bottom-spacer/>
30+
</div>
31+
32+
<div id="main">
33+
<h1 align="center">Project</h1>
34+
</div>
35+
36+
</body>
37+
38+
</html>

0 commit comments

Comments
 (0)