Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

El Legado De Pintia
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

56f2651b

Commit 56f2651b authored 5 months ago by diegval

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/GeneracionDeEventosMejorada' into develop

parents 8c6bef82 eb23de0d

No related branches found

No related tags found

1 merge request!65Feature:

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GeneradorDeEventos.kt 64 additions, 9 deletions

...depintia/exploradoresDePintia/model/GeneradorDeEventos.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/TipoEvento.kt 1 addition, 1 deletion

...ellegadodepintia/exploradoresDePintia/model/TipoEvento.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/DescansoFactory.kt 16 additions, 22 deletions

...ploradoresDePintia/model/eventoFactory/DescansoFactory.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/EventoDescanso.kt 14 additions, 1 deletion

...xploradoresDePintia/model/eventoFactory/EventoDescanso.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/EventoFactorySelector.kt 1 addition, 24 deletions

...oresDePintia/model/eventoFactory/EventoFactorySelector.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/RiesgoFactory.kt 1 addition, 1 deletion

...exploradoresDePintia/model/eventoFactory/RiesgoFactory.kt

with 97 additions and 58 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment