forked from Arquisoft/wiq_0
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
9 additions
and
77 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -616,105 +616,37 @@ <h2 id="section-introduction-and-goals">1. Introduction and Goals</h2> | |
| </div> | ||
| <table class="tableblock frame-all grid-all stretch"> | ||
| <colgroup> | ||
| <col style="width: 100%;"> | ||
| <col style="width: 33.3333%;"> | ||
| <col style="width: 33.3333%;"> | ||
| <col style="width: 33.3334%;"> | ||
| </colgroup> | ||
| <thead> | ||
| <tr> | ||
| <th class="tableblock halign-left valign-top"><<<<<<< HEAD</th> | ||
| <th class="tableblock halign-left valign-top">Role/Name</th> | ||
| <th class="tableblock halign-left valign-top">Contact</th> | ||
| <th class="tableblock halign-left valign-top">Expectations</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Role/Name</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Contact</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Expectations</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Alfredo Jirout Cid</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:[email protected]">[email protected]</a></p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Aprobar (opcional)</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Rodrigo Gracía Iglesias</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:[email protected]">[email protected]</a></p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">No tomar de ejemplo a Miguel</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Iyán Fernández Riol</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:[email protected]">[email protected]</a></p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Sacar matricula</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Martín Cancio Barrera</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="mailto:[email protected]">[email protected]</a></p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Ser feliz | ||
| =======</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Role/Name</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Contact</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Expectations</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock"><strong><em>Estudiantes (HappySw)</em></strong></p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Martín Cancio Barrera, Iyán Fernández Riol, Rodrigo García Iglesias y Alfredo Jirout Cid</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Los estudiantes son los desarrolladores de la aplicación. Están a cargo del desarrollo completo, lo que mejorará sus habilidades tanto de programación como de trabajo en grupo.</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock"><strong><em>Usuarios</em></strong></p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Cualquier persona que utilice la aplicación</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Los usuarios son los que en última instancia van a utilizar la aplicación, por lo que debe ser intuitiva y fácil de entender.</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock"><strong><em>Profesores</em></strong></p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">José Emilio Labra Gayo, Pablo González González, Jorge Álvarez Fidalgo y Cristian Augusto Alonso</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Son los supervisores del proyecto, y ayudarán a los estudiantes para asegurarse de que el proyecto llegue a buen puerto.</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock"><strong><em>RTVE</em></strong></p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">RTVE</p></td> | ||
| </tr> | ||
| <tr> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Son los principales interesados en la aplicación, puesto que son los que la han encargado, para que sus espectadores puedan utilizarla. | ||
| >>>>>>> 3eb24632ad8f32234457b6498042b6f03b9cfc5e</p></td> | ||
| <td class="tableblock halign-left valign-top"><p class="tableblock">Ser feliz</p></td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
|
|
@@ -777,15 +709,15 @@ <h2 id="section-introduction-and-goals">1. Introduction and Goals</h2> | |
| </div> | ||
| <div class="imageblock"> | ||
| <div class="content"> | ||
| <img src="./images/businesscontext.png" alt="businesscontext" width="1017" height="578"> | ||
| <img src="./images/businesscontext.png" alt="businesscontext" width="1008" height="578"> | ||
| </div> | ||
| </div> | ||
| <div class="paragraph"> | ||
| <p>=== Technical Context</p> | ||
| </div> | ||
| <div class="imageblock"> | ||
| <div class="content"> | ||
| <img src="./images/technicalcontext.png" alt="technicalcontext" width="1040" height="578"> | ||
| <img src="./images/technicalcontext.png" alt="technicalcontext" width="1033" height="578"> | ||
| </div> | ||
| </div> | ||
| <div style="page-break-after: always;"></div> | ||
|
|
||