Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lanzamiento Beta #9

Merged
merged 41 commits into from
Nov 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
0dad5b2
Update .gitignore
EmanuelM153 Nov 19, 2023
5fca142
Init
EmanuelM153 Nov 19, 2023
ee213bb
Actualizacion Interfaz USER
WatashiWaraio Nov 20, 2023
b411479
Actualizacion Interfaz Tutoriales
Nov 20, 2023
037caeb
Actualizacion Interfaz Admin Usuarios (Falta poner el Button Group)
Nov 20, 2023
1e669f9
UIADMIN SIN ERRORES, se copio de nuevo
WatashiWaraio Nov 20, 2023
ed4ea3f
UIAdminInfo Se le agrega ala interfaz un TextField para colocar
WatashiWaraio Nov 20, 2023
efad870
UIADMIN USUARIO nueva inteface
WatashiWaraio Nov 20, 2023
15002f0
uilogin CAMBIO DE VARIABLES PRIVADAS A PUBLICAS PARA PODER TRABAJAR
WatashiWaraio Nov 20, 2023
7bdf79c
Faltaron las manchas
WatashiWaraio Nov 20, 2023
d2f97ee
Merge pull request #1 from EmanuelM153/Interfaces_Graficas_ACT
EmanuelM153 Nov 22, 2023
454c0f3
Nueva versión debida a problemas con las interfaces pasadas. Se compl…
Nov 23, 2023
c8e35b4
Actualizado gitignore para ignorar el directorio build
Nov 23, 2023
63a6802
Actualizado el requerimiento de la plataforma java a la versión 17 pa…
Nov 23, 2023
0c1f740
Actualizado gitignore para ignorar los archivos user.dat e info.dat
Nov 23, 2023
4ee36da
Añadido la variable serialVersionUID para Buscable que implementa Ser…
Nov 23, 2023
64829b2
Resolvi algunas cositas
WatashiWaraio Nov 23, 2023
b2a4243
Arreglado que cuando se intentara crear un usuario existente se mostr…
Nov 23, 2023
f505cd2
Merge pull request #2 from EmanuelM153/hotfix0.1
EmanuelM153 Nov 23, 2023
9a28e4a
Merge origin/develop2 into HotFix_0.2
Nov 24, 2023
4def04b
Merge pull request #3 from EmanuelM153/HotFix_0.2
EmanuelM153 Nov 24, 2023
b375791
Actualizado UIADMINFORMACION y UITUTORIALES para incluir todos los re…
Nov 24, 2023
244268d
Actualizado la clase Informacion para usar LocalTime y para que en el…
Nov 24, 2023
f97a8d8
Desarrollo de controladores. Mi parte.
Nov 24, 2023
db900cb
Solucionados los problemas de fusion
WatashiWaraio Nov 24, 2023
d98cdf4
Tratando de solucionar bugs
WatashiWaraio Nov 24, 2023
88619b4
Se soluciona el flujo de la aplicacion
WatashiWaraio Nov 24, 2023
ad319f6
Merge pull request #5 from EmanuelM153/ControladoresSof
EmanuelM153 Nov 24, 2023
b89a8e9
Avance en el controlador de tutoriales
Nov 24, 2023
6d0238b
Merge origin/develop2 into controladores_e
Nov 24, 2023
6b6ca89
Actualizado Información para que en vez de tener un tipo tenga un nombre
Nov 24, 2023
a3d1d24
Actualizada la vista de tutoriales para poder mostrar un tutorial usa…
Nov 24, 2023
9538062
Terminado ControllerTutoriales. Y arreglado el tamaño del botón para …
Nov 24, 2023
889972d
Se Arreglan cosas de admin Usuarios
WatashiWaraio Nov 24, 2023
2cabd25
Se solucionaron algunos problemas con Informacion y lo que guardaba e…
Nov 24, 2023
deacc5f
Resuelto un bug por el cual no se podia realizar actualizaciones en A…
Nov 24, 2023
eac7cde
Merge pull request #7 from EmanuelM153/controladores_e
EmanuelM153 Nov 24, 2023
f08210f
Merge origin/develop2 into AdminUsuarios_0.2
Nov 24, 2023
3de13dd
Actualizado ControllerAdminUsers para tener una mejor busqueda por tabla
Nov 24, 2023
18eaa64
Listo para el lanzamiento
Nov 24, 2023
29276bf
Merge pull request #8 from EmanuelM153/AdminUsuarios_0.2
EmanuelM153 Nov 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Netbeans
/test/
/nbproject/private/
manifest.mf

# Compiled class file
*.class

Expand All @@ -22,3 +27,7 @@
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*
/build/
/user.dat
/info.dat
/dist/
73 changes: 73 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="proyecto_fundamentos" default="default" basedir=".">
<description>Builds, tests, and runs the project proyecto_fundamentos.</description>
<import file="nbproject/build-impl.xml"/>
<!--

There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:

-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-jar: called before JAR building
-post-jar: called after JAR building
-post-clean: called after cleaning build products

(Targets beginning with '-' are not intended to be called on their own.)

Example of inserting an obfuscator after compilation could look like this:

<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>

For list of available properties check the imported
nbproject/build-impl.xml file.


Another way to customize the build is by overriding existing main targets.
The targets of interest are:

-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar: JAR building
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation

An example of overriding the target for project execution could look like this:

<target name="run" depends="proyecto_fundamentos-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>

Notice that the overridden target depends on the jar target and not only on
the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
nbproject/build-impl.xml file.

-->
</project>
Loading