Skip to content

Commit 9877b6a

Browse files
committed
-Cambios en datos precargados
-Cambio en la actualización de puntos del usuario -Correción test -Cambios en el archivo readme de github añadiendo el manual en video y en pdf e instrucciones de instalación.
1 parent 936a289 commit 9877b6a

File tree

13 files changed

+46
-2539
lines changed

13 files changed

+46
-2539
lines changed

API.md

Lines changed: 0 additions & 1636 deletions
This file was deleted.

AngularContafin/src/app/component/unit/unit-creation/unit-creation.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ <h1 class="text-uppercase">
265265
<button (click)="addExercise(1,null,lesson.id)" ngbDropdownItem>Tipo 1</button>
266266
<button (click)="addExercise(2,null,lesson.id)" ngbDropdownItem>Tipo 2</button>
267267
<button (click)="addExercise(3,null,lesson.id)" ngbDropdownItem>Tipo 3</button>
268-
<button (click)="addExercise(5,null,lesson.id)" ngbDropdownItem>Tipo 5</button>
269-
<button (click)="addExercise(7,null,lesson.id)" ngbDropdownItem>Tipo 7</button>
268+
<button (click)="addExercise(5,null,lesson.id)" ngbDropdownItem>Tipo 4</button>
269+
<button (click)="addExercise(7,null,lesson.id)" ngbDropdownItem>Tipo 5</button>
270270
</div>
271271
</li>
272272
</ul>

AngularContafin/src/app/services/unit.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export class UnitsService {
9393
let useData = null;
9494
await this.utils.restService('/Unit/', {
9595
queryString:'delete/' + id,
96-
method: 'get',
96+
method: 'delete',
9797
params: id
9898
}).toPromise().then(
9999
(data) => {

AngularContafin/src/styles.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ header.masthead {
186186
background-position: center center;
187187
background-size: cover;
188188
background-color: #ffe0c6;
189-
height: 120%;
189+
height: 140%;
190190
}
191191

192192

Manual_de_uso.pdf

583 KB
Binary file not shown.

README.md

Lines changed: 17 additions & 183 deletions
Original file line numberDiff line numberDiff line change
@@ -1,192 +1,26 @@
1-
***by CONTaFinTEAM***
2-
# CONTaFin
3-
In this repository we will place our web application, which helps students to learn contability and lets teachers to control them.
1+
# ContaFin
42

5-
[![DAW-CONTaFIN](http://img.youtube.com/vi/dd_GVtREpyg/0.jpg)](https://www.youtube.com/watch?v=dd_GVtREpyg&feature=youtu.be)
3+
## Manual de instalación
4+
Requisitos del sistema para la correcta instalación de ContaFin:
5+
• Tener instalado en el entorno Docker. Se puede descargar desde [aquí](https://docs.docker.com/install/#supported-platforms).
6+
• Clonar el repositorio de Github.
67

7-
## Team :
8+
Para hacer que se ejecute la aplicación solo hay que ir a la carpeta raíz del proyecto y ejecutar el siguiente comando:
89

9-
- Luis Caumel Morales:
10-
11-
- E-mail: l.caumel@alumnos.urjc.es.
12-
- Github: [Caumel](https://github.com/Caumel).
13-
14-
- Lizeth Marcela de la Torre:
15-
16-
- E-mail: lm.delatorre@alumnos.urjc.es.
17-
- Github: [marceladb](https://github.com/marceladb).
18-
19-
- Raul Velasco Rubio:
20-
21-
- E-mail: r.velascor@alumnos.urjc.es.
22-
- Github: [raulvr2](https://github.com/raulvr2).
23-
24-
- Jaime Morillo Leal:
25-
26-
- E-mail: j.morillol@alumnos.urjc.es.
27-
- Github: [Jaimemorillo](https://github.com/Jaimemorillo).
28-
29-
- Alejendro Pinto Fernandez
30-
31-
- E-mail: a.pinto@alumnos.urjc.es.
32-
- Github: [AlejandroPinto](https://github.com/AMBushido).
10+
“docker-compose up”.
3311

34-
## Tools :
35-
36-
- [Trello](https://trello.com/b/4dZpQcvA/desarrollo-de-aplicaciones-web).
37-
- [Project](https://github.com/Caumel/DAW-G11-2018).
38-
39-
## About the project:
40-
41-
### Topic
42-
Website Contability-learning platform.
43-
### Database entities
12+
Para acabar la ejecución se debe introducir y ejecutar el comando:
4413

45-
- User:
14+
"docker-compose down".
4615

47-
- Anonymous.
48-
- Student.
49-
- Teacher (administrator).
50-
51-
- Unit.
52-
- Lesson.
53-
- Exercise.
54-
- Answer.
55-
56-
### Advanced functionality
16+
Esto hará que la aplicación se inicie de forma escalonada empezando por la base de datos en el puerto 3306, el servidor en el puerto 8080 y el cliente en el puerto 4200.
17+
Para acceder a la aplicación se hará uso de un navegador web en el que se debe introducir la siguiente dirección:
5718

58-
- Progress Statistics.
59-
- Basic User Information.
19+
http://localhost:4200/
6020

61-
### Graphic information
62-
We are going to use line graphics showing students information (days/hours).
63-
### Other functionality
64-
65-
- Logging alternatives.
66-
- Export to excel.
67-
- Send e-mails.
68-
69-
70-
## Phase 2
71-
### Navigation Diagram:
72-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/Navigation%20diagram.png)
73-
### index.html
74-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/index.PNG)
75-
### login.html
76-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/inicio.PNG)
77-
### home.html
78-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/home.PNG)
79-
### profile.html
80-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/profile.PNG)
81-
### lessons.html
82-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/lessons.PNG)
83-
### excerciseType1.html
84-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/exerciseType1.PNG)
85-
### excerciseType2.html
86-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/exerciseType2.PNG)
87-
### excerciseType3.html
88-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/exerciseType3.PNG)
89-
### excerciseType4.html
90-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/exerciseType4.PNG)
91-
### excerciseType5.html
92-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/exerciseType5.PNG)
93-
### excerciseType6.html
94-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/exerciseType6.PNG)
95-
### excerciseType7.html
96-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/exerciseType7.PNG)
97-
### completedLesson.html
98-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/completedLesson.PNG)
99-
### continueLesson.html
100-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%202%20documentation/continueLessons.PNG)
101-
102-
## Phase 3
103-
### Navigation Diagram:
104-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/NavigationDiagram.png)
105-
### index.html
106-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/Screenshots/index.png)
107-
### index.html(2)
108-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/Screenshots/index2.png)
109-
### home.html
110-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/Screenshots/home.png)
111-
### profile.html
112-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/Screenshots/profile.png)
113-
### configuration.html
114-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/Screenshots/Configuration.png)
115-
### addGoal.html
116-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/Screenshots/addGoal.png)
117-
### lessons.html
118-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/Screenshots/lessons.png)
119-
### exercise.html
120-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/Screenshots/Exercise.png)
121-
### lessonCompleted.html
122-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/Screenshots/lessonCompleted.png)
123-
### continueLesson.html
124-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/Screenshots/continueLesson.png)
125-
### adminHome.html
126-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/Screenshots/AdminHome.png)
127-
### usersData.html
128-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/Screenshots/AdminUsersData.png)
129-
### unitCreation.html
130-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/Screenshots/unitCreation.png)
131-
132-
## Database diagram
133-
### Diagram with the entities of the database, its fields and the relationships between them.
134-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/diagram.png)
135-
136-
## Class and templates diagram
137-
### Classes
138-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/diagram1.PNG)
139-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/diagram2.PNG)
140-
### Templates
141-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%203%20documentation/diagram3.PNG)
142-
143-
## How to use
144-
### STS and MySL Workbench Configuration
145-
Open the framework STS
146-
File -> Open Projects From Files System -> Directory... -> And we select the route where we keep the project
147-
Open MySQL Workbench
148-
Select a MySQL connection user curro be "root" and the password "pass"
149-
Once inside we will click on Create a new Schema in the connected server whose name will be "test"
150-
Start our application
151-
Once we have the connection of MySQL connected and the loaded project we will press in the Aplication.java of our application loaded in STS and we will Run as: Spring Boot App.
152-
#### Configure IDE
153-
- Download STS (http://spring.io/tools/sts/all).
154-
- Import as a Maven project.
155-
- Update Maven project.
156-
- Run as a Spring Boot application.
157-
- Go to https://localhost:8080
158-
- Enjoy our application.
159-
### Anonymous users
160-
As an anonymous user we can enter the application and perform the available lessons in addition to creating or entering our profile.
161-
### Registered users
162-
As registered users we can make the different lessons and progress in them, we can also see data about our profile as the level and our progress, we can also configure our account and set a goal to get an objective
163-
### Admin
164-
As administrators of our application you will get the same options with the application as other registered users but you can also view and export the users´ data and create new lessons.
165-
166-
The application does not need more explanations since it is very intuitive because it is intended for teaching.
167-
168-
## Phase 4
169-
### REST API documentation
170-
Document [Api documentation](API.md) with information about the REST API.
171-
### Docker
172-
Docker lets you to use our app in a very easy way without having anything install, you just need Docker.
173-
Read the [Docker usage](DOCKER.md) to know more.
174-
### Class and templates diagram
175-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%204%20documentation/diagram.png)
176-
177-
## Phase 5
178-
## Angular documentation
179-
Document [Angular documentation](AngularContafin/README.md) with information about our work with Angular
180-
181-
![Navigation Diagram](https://github.com/Caumel/DAW-G11-2018/blob/master/Phase%205%20documentation/diagram.png)
21+
## Manual de uso
18222

183-
## Sonarqube documentation
184-
### Information
185-
Documentation of [Sonarqube](https://docs.sonarqube.org/display/SONAR/Documentation) on requirements, operations and guidelines on how to use it.
186-
### Guide
187-
[Sonarqube](Sonar.md) document that shows the steps to follow to develop the sonar analysis environment.
188-
## Selenium documentation
189-
### Information
190-
Documentation of [Selenium](https://www.seleniumhq.org/) on requirements, operations and guidelines on how to use it.
191-
### Guide
192-
[Selenium](Selenium.md) Selenium start guide.
23+
### Versión video
24+
[Video manual] (https://youtu.be/0_A530kgeZE)
25+
### Versión pdf
26+
[Manual PDF](https://github.com/Daniparri/DAW-G11-2018/Manual_de_uso.pdf)

READMETemplate.md

Lines changed: 0 additions & 71 deletions
This file was deleted.

Selenium.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)