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

Javifurlan/80161676 modified database #10

Open
wants to merge 113 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
5dc94af
Add SRS file
dahue Apr 25, 2014
c4ac657
Add SRS.doc
javifurlan Apr 25, 2014
80dd38d
base de datos
tavomartinez88 May 5, 2014
18a18b5
Modified schema.sql
javifurlan May 5, 2014
e959236
Proyecto funcionando
dahue May 9, 2014
d287e17
Database funcionando
javifurlan May 14, 2014
e152ad3
ultima version de la bd
May 16, 2014
528d427
nuevos cambios en el modelo user
May 16, 2014
7bd5d21
users
May 16, 2014
90ff353
Updated database
javifurlan May 16, 2014
2bbdaac
Updated database
javifurlan May 16, 2014
80f095f
falta eliminar y actualizar
May 16, 2014
7f470d3
App principal
May 16, 2014
932b19c
falta eliminar y actualizar
May 16, 2014
3e7785d
modelo User terminado
May 17, 2014
4c09e9f
test del modelo user terminado
May 17, 2014
fbd7a47
cambios nuevos
May 17, 2014
0bc8023
Address model created
javifurlan May 17, 2014
1f0884d
AddressTest created
javifurlan May 17, 2014
9c0aeee
Modificacion de pom.xml y la clase app.java, ya esta funcionando spar…
dahue May 17, 2014
01a19fc
Merge branch 'master' of http://github.com/dahue/carsapp
dahue May 17, 2014
a9dd794
Modified DB
javifurlan May 18, 2014
2b3bb28
modelo vehiculo,auto,moto,camioneta
May 19, 2014
9961fb9
Merge branch 'master' of https://github.com/dahue/carsapp
May 19, 2014
3ba2898
change in the coments of the models
May 20, 2014
ecb3cf5
change in the coments of the models
May 20, 2014
eb4efdd
Updated database
javifurlan May 20, 2014
2742f79
Updated Models & Tests
javifurlan May 20, 2014
c31a942
Updated Models & Tests
javifurlan May 20, 2014
1e4bb11
Delete Motocicle.java
javifurlan May 21, 2014
6c818f7
Delete MotocicleTest.java
javifurlan May 21, 2014
6df90e1
base actual
May 22, 2014
26a9488
Updated DB
javifurlan May 22, 2014
0c7d3ac
UsersAddresses model
javifurlan May 22, 2014
8778fe0
Address,UsersAddresses up-to-date
javifurlan May 22, 2014
5042e8e
AddressTest up-to-date
javifurlan May 22, 2014
1344c25
User model up-to-date
javifurlan May 22, 2014
1453179
Post model, PostTest, ER-Diagram
dahue May 22, 2014
58d4e54
load questionTest,answerTest and punctuationTest
May 22, 2014
cb98c91
modelo Question y Punctuation
May 22, 2014
ecfcbd8
modelo Answer
May 22, 2014
24e46ec
Burn down chart
May 23, 2014
1d682ae
modelos funcionando
dahue May 23, 2014
479c06d
Fixed RateTest error
dahue May 24, 2014
1b7d8ac
Updated models Address & User
javifurlan May 27, 2014
be54132
Updated Address model
javifurlan May 28, 2014
feb701b
Vehicle model and some inserts on db
dahue May 28, 2014
92b26af
Added get's
javifurlan May 29, 2014
2c6034d
Added some GETs
May 29, 2014
4ddcd3a
Modified App.java
javifurlan May 29, 2014
8a6a447
Added boostrap.js
javifurlan May 30, 2014
aa00d8e
Adding GETs and POST. Adding index.html and css
May 30, 2014
15c371a
Updating App.java
arangue May 31, 2014
cc425bf
Update App
arangue Jun 4, 2014
f2bf8aa
Updated App,Address,User,schema & pom
javifurlan Jun 7, 2014
903a83a
Added post's - Trying out Moustache
javifurlan Jun 7, 2014
7f197ac
Added post's - Trying out Moustache
javifurlan Jun 7, 2014
4287616
agregados los get de cars, motorcycles y trucks
dahue Jun 9, 2014
503f0e0
agregadas nuevas dependecias en POM para elasticsearch
dahue Jun 9, 2014
c852520
Updated App.java & some models
javifurlan Jun 10, 2014
59adb51
Updated App.java & some models
javifurlan Jun 10, 2014
c1a02ae
Added mustaches
javifurlan Jun 13, 2014
693493f
Added question mustache
arangue Jun 13, 2014
0247369
load templates posts,posts_id,rate,rate_id and update App and update …
Jun 13, 2014
3e7a5e3
Updated App.java
javifurlan Jun 13, 2014
fc9c920
Delete index.html
javifurlan Jun 13, 2014
4432521
load questions.mustache and questions_id mustache, update app and mod…
Jun 13, 2014
4bda4e7
Fixing some errors
arangue Jun 14, 2014
b5ac9ca
Delete addressId.mustache
javifurlan Jun 19, 2014
e88a0ff
Delete addresses.mustache
javifurlan Jun 19, 2014
c9f9727
Delete answerId.mustache
javifurlan Jun 19, 2014
35e89b5
Delete answers.mustache
javifurlan Jun 19, 2014
d99b01e
Delete carId.mustache
javifurlan Jun 19, 2014
0c7b7c9
Delete cars.mustache
javifurlan Jun 19, 2014
978010a
Delete hello.mustache
javifurlan Jun 19, 2014
3d8fc9e
Delete motorcycleId.mustache
javifurlan Jun 19, 2014
733a3e4
Delete motorcycles.mustache
javifurlan Jun 19, 2014
907f902
Delete posts.mustache
javifurlan Jun 19, 2014
da6c826
Delete posts_id.mustache
javifurlan Jun 19, 2014
0146231
Delete punctuations.mustache
javifurlan Jun 19, 2014
f17bc68
Delete punctuationsId.mustache
javifurlan Jun 19, 2014
4e71669
Delete questions.mustache
javifurlan Jun 19, 2014
ba8dd30
Delete questions_id.mustache
javifurlan Jun 19, 2014
386eb39
Delete rates.mustache
javifurlan Jun 19, 2014
619d89d
Delete rates_id.mustache
javifurlan Jun 19, 2014
742cd2d
Delete truckId.mustache
javifurlan Jun 19, 2014
0152741
Delete trucks.mustache
javifurlan Jun 19, 2014
5150558
Delete userId.mustache
javifurlan Jun 19, 2014
6d9c69e
Delete users.mustache
javifurlan Jun 19, 2014
7d525e3
Delete vehicleId.mustache
javifurlan Jun 19, 2014
2dd3907
Delete vehicles.mustache
javifurlan Jun 19, 2014
5f65b47
Updated templates
javifurlan Jun 19, 2014
aa6e6bf
Delete README.md
javifurlan Jun 19, 2014
174fbd9
Delete bootstrap.min.css
javifurlan Jun 20, 2014
8ddabb3
Delete bootstrap.min.js
javifurlan Jun 20, 2014
6a0c142
elasticsearch funcionando
dahue Jun 20, 2014
babad8a
Merge branch 'master' of http://github.com/dahue/carsapp
dahue Jun 20, 2014
a3aac77
busqueda de anuncios funcionando
dahue Jun 22, 2014
20966cc
modificacion en template search
dahue Jun 22, 2014
cee7249
modificacion en template search
dahue Jun 22, 2014
6e89ddb
modificacion en template search
dahue Jun 22, 2014
a8b25ed
Modified Address.java
javifurlan Jun 23, 2014
f772935
search.mustache modify
Jun 23, 2014
767c06c
load uml
Jun 24, 2014
fbdf92c
planificacion de carsapp
tavomartinez88 Sep 3, 2014
9bb3d75
Delete BurndownChart.ods
javifurlan Sep 15, 2014
795adc8
Testing Pivotal Tracker API
Sep 16, 2014
cae821e
[79051752]update planning
tavomartinez88 Sep 18, 2014
78cfcde
[#79051752]update planning
tavomartinez88 Sep 30, 2014
3f6d1d4
[#80161676] Modified Database
javifurlan Oct 21, 2014
a5be00a
[#80161676 #80217768 #80217828 #80217866 #80217896 #80217944 #8021802…
tavomartinez88 Oct 21, 2014
b572eaa
[finished #80161676 #80217768 #80217828 #80217866 #80217896 #80217944…
tavomartinez88 Oct 21, 2014
359eb54
Algunos arreglos
Oct 28, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 14 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
<classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.0.4/mysql-connector-java-5.0.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-simple/1.7.6/slf4j-simple-1.7.6.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.jar"/>
<classpathentry kind="var" path="M2_REPO/org/javalite/activejdbc/1.4.9/activejdbc-1.4.9.jar"/>
<classpathentry kind="var" path="M2_REPO/org/javalite/javalite-common/1.4.9/javalite-common-1.4.9.jar"/>
</classpath>
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
target/**/*
*~
**/*~
14 changes: 14 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>cars-app</name>
<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
5 changes: 5 additions & 0 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Sat May 17 01:07:21 ART 2014
org.eclipse.jdt.core.compiler.codegen.targetPlatform=5
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=5
org.eclipse.jdt.core.compiler.compliance=5
220 changes: 220 additions & 0 deletions Documentacion/ERdiag.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
<?xml version='1.0'?>
<diagram>
<elements>
<entityid id="0" posX="359" posY="194" name="users"></entityid>
<entityid id="1" posX="275" posY="577" name="posts"></entityid>
<entityid id="2" posX="577" posY="707" name="rates"></entityid>
<entityid id="3" posX="100" posY="68" name="answers"></entityid>
<entityid id="4" posX="100" posY="430" name="questions"></entityid>
<entityid id="5" posX="841" posY="438" name="cars"></entityid>
<entityid id="6" posX="959" posY="295" name="vehicles"></entityid>
<entityid id="7" posX="679" posY="317" name="punctuation"></entityid>
<entityid id="8" posX="708" posY="66" name="addresses"></entityid>
<entityid id="9" posX="1065" posY="436" name="motorcycles"></entityid>
<entityid id="10" posX="959" posY="437" name="trucks"></entityid>
<attributeid id="11" posX="455" posY="152" type="normal" name="points" required="false" unique="false" datatype="integer" length="50"></attributeid>
<attributeid id="12" posX="489" posY="211" type="normal" name="count_operation" required="false" unique="false" datatype="integer" length="50"></attributeid>
<attributeid id="13" posX="248" posY="237" type="normal" name="email" required="true" unique="true" datatype="varchar" length="50"></attributeid>
<attributeid id="14" posX="226" posY="194" type="normal" name="last_name" required="true" unique="false" datatype="varchar" length="50"></attributeid>
<attributeid id="15" posX="373" posY="118" type="key" name="id" required="true" unique="true" datatype="integer" length="50"></attributeid>
<attributeid id="16" posX="262" posY="146" type="normal" name="name" required="true" unique="false" datatype="varchar" length="50"></attributeid>
<attributeid id="17" posX="160" posY="21" type="normal" name="description" required="true" unique="false" datatype="varchar" length="50"></attributeid>
<attributeid id="18" posX="64" posY="22" type="key" name="id" required="true" unique="true" datatype="integer" length="50"></attributeid>
<attributeid id="19" posX="150" posY="497" type="normal" name="description" required="true" unique="false" datatype="varchar" length="50"></attributeid>
<attributeid id="20" posX="47" posY="493" type="key" name="id" required="true" unique="true" datatype="integer" length="50"></attributeid>
<attributeid id="21" posX="827" posY="277" type="key" name="licence_plate" required="true" unique="true" datatype="varchar" length="6"></attributeid>
<attributeid id="22" posX="961" posY="235" type="normal" name="model" required="true" unique="false" datatype="integer" length="50"></attributeid>
<attributeid id="23" posX="1059" posY="254" type="normal" name="brand" required="true" unique="false" datatype="varchar" length="50"></attributeid>
<attributeid id="24" posX="841" posY="512" type="normal" name="is_coupe" required="true" unique="false" datatype="char" length="50"></attributeid>
<attributeid id="25" posX="958" posY="514" type="normal" name="count_belt" required="true" unique="false" datatype="integer" length="50"></attributeid>
<attributeid id="26" posX="1065" posY="509" type="normal" name="wheel_size" required="true" unique="false" datatype="integer" length="50"></attributeid>
<attributeid id="27" posX="1067" posY="308" type="normal" name="engine_size" required="true" unique="false" datatype="integer" length="50"></attributeid>
<attributeid id="28" posX="341" posY="517" type="key" name="id" required="true" unique="true" datatype="integer" length="50"></attributeid>
<attributeid id="29" posX="368" posY="643" type="normal" name="description" required="true" unique="false" datatype="varchar" length="50"></attributeid>
<attributeid id="30" posX="636" posY="751" type="key" name="id" required="true" unique="true" datatype="integer" length="50"></attributeid>
<attributeid id="31" posX="523" posY="751" type="normal" name="stars" required="true" unique="false" datatype="integer" length="50"></attributeid>
<attributeid id="32" posX="615" posY="102" type="key" name="id" required="true" unique="true" datatype="integer" length="50"></attributeid>
<attributeid id="33" posX="607" posY="24" type="normal" name="street" required="true" unique="false" datatype="varchar" length="50"></attributeid>
<attributeid id="34" posX="725" posY="20" type="normal" name="num" required="true" unique="false" datatype="integer" length="50"></attributeid>
<attributeid id="35" posX="827" posY="24" type="normal" name="apartment" required="true" unique="false" datatype="varchar" length="50"></attributeid>
<attributeid id="36" posX="630" posY="365" type="key" name="id" required="true" unique="true" datatype="integer" length="50"></attributeid>
<attributeid id="37" posX="740" posY="364" type="normal" name="points" required="true" unique="false" datatype="integer" length="50"></attributeid>
<relationshipid id="38" posX="286" posY="392" name="users_posts"></relationshipid>
<relationshipid id="39" posX="261" posY="744" name="posts_rates"></relationshipid>
<relationshipid id="40" posX="66" posY="250" name="questions_answers"></relationshipid>
<relationshipid id="41" posX="241" posY="68" name="users_answers"></relationshipid>
<relationshipid id="42" posX="193" posY="332" name="users_questions"></relationshipid>
<relationshipid id="43" posX="449" posY="66" name="users_addresses"></relationshipid>
<relationshipid id="44" posX="481" posY="317" name="users_punctuation"></relationshipid>
<relationshipid id="45" posX="704" posY="153" name="users_vehicles"></relationshipid>
<relationshipid id="46" posX="455" posY="416" name="users_rates"></relationshipid>
<relationshipid id="47" posX="599" posY="455" name="posts_vehicles"></relationshipid>
<isaid id="48" posX="959" posY="365"></isaid>
<entityid id="49" posX="1014" posY="105" name="cities"></entityid>
<relationshipid id="50" posX="839" posY="105" name="addresses_cities"></relationshipid>
<attributeid id="51" posX="994" posY="54" type="key" name="zip_code" required="true" unique="true" datatype="integer" length="50"></attributeid>
<attributeid id="52" posX="1093" posY="60" type="normal" name="province" required="true" unique="true" datatype="varchar" length="50"></attributeid>
<attributeid id="53" posX="1095" posY="142" type="normal" name="name" required="true" unique="false" datatype="varchar" length="50"></attributeid>
<relationshipid id="54" posX="73" posY="579" name="posts_questions"></relationshipid>
<attributeid id="55" posX="191" posY="643" type="normal" name="title" required="true" unique="false" datatype="varchar" length="50"></attributeid>
</elements>
<entity id="0">
<attributelist>
<attribute id="11"></attribute>
<attribute id="12"></attribute>
<attribute id="13"></attribute>
<attribute id="14"></attribute>
<attribute id="15"></attribute>
<attribute id="16"></attribute>
</attributelist>
</entity>
<entity id="1">
<attributelist>
<attribute id="28"></attribute>
<attribute id="29"></attribute>
<attribute id="55"></attribute>
</attributelist>
</entity>
<entity id="2">
<attributelist>
<attribute id="30"></attribute>
<attribute id="31"></attribute>
</attributelist>
</entity>
<entity id="3">
<attributelist>
<attribute id="17"></attribute>
<attribute id="18"></attribute>
</attributelist>
</entity>
<entity id="4">
<attributelist>
<attribute id="19"></attribute>
<attribute id="20"></attribute>
</attributelist>
</entity>
<entity id="5">
<attributelist>
<attribute id="24"></attribute>
</attributelist>
</entity>
<entity id="6">
<attributelist>
<attribute id="21"></attribute>
<attribute id="22"></attribute>
<attribute id="23"></attribute>
<attribute id="27"></attribute>
</attributelist>
</entity>
<entity id="7">
<attributelist>
<attribute id="36"></attribute>
<attribute id="37"></attribute>
</attributelist>
</entity>
<entity id="8">
<attributelist>
<attribute id="32"></attribute>
<attribute id="33"></attribute>
<attribute id="34"></attribute>
<attribute id="35"></attribute>
</attributelist>
</entity>
<entity id="9">
<attributelist>
<attribute id="26"></attribute>
</attributelist>
</entity>
<entity id="10">
<attributelist>
<attribute id="25"></attribute>
</attributelist>
</entity>
<relationship id="38">
<rolelist>
<role mincard="1" maxcard="1" name="" entityid="0" refintegrity="false"></role>
<role mincard="0" maxcard="N" name="" entityid="1" refintegrity="false"></role>
</rolelist>
</relationship>
<relationship id="39">
<rolelist>
<role mincard="1" maxcard="1" name="" entityid="1" refintegrity="false"></role>
<role mincard="0" maxcard="N" name="" entityid="2" refintegrity="false"></role>
</rolelist>
</relationship>
<relationship id="40">
<rolelist>
<role mincard="1" maxcard="1" name="" entityid="3" refintegrity="false"></role>
<role mincard="1" maxcard="1" name="" entityid="4" refintegrity="false"></role>
</rolelist>
</relationship>
<relationship id="41">
<rolelist>
<role mincard="0" maxcard="N" name="" entityid="3" refintegrity="false"></role>
<role mincard="1" maxcard="1" name="" entityid="0" refintegrity="false"></role>
</rolelist>
</relationship>
<relationship id="42">
<rolelist>
<role mincard="0" maxcard="N" name="" entityid="4" refintegrity="false"></role>
<role mincard="1" maxcard="1" name="" entityid="0" refintegrity="false"></role>
</rolelist>
</relationship>
<relationship id="43">
<rolelist>
<role mincard="1" maxcard="N" name="" entityid="0" refintegrity="false"></role>
<role mincard="1" maxcard="N" name="" entityid="8" refintegrity="false"></role>
</rolelist>
</relationship>
<relationship id="44">
<rolelist>
<role mincard="1" maxcard="1" name="" entityid="0" refintegrity="false"></role>
<role mincard="0" maxcard="N" name="" entityid="7" refintegrity="false"></role>
</rolelist>
</relationship>
<relationship id="45">
<rolelist>
<role mincard="1" maxcard="1" name="" entityid="0" refintegrity="false"></role>
<role mincard="0" maxcard="N" name="" entityid="6" refintegrity="false"></role>
</rolelist>
</relationship>
<relationship id="46">
<rolelist>
<role mincard="0" maxcard="N" name="" entityid="2" refintegrity="false"></role>
<role mincard="1" maxcard="1" name="" entityid="0" refintegrity="false"></role>
</rolelist>
</relationship>
<relationship id="47">
<rolelist>
<role mincard="1" maxcard="1" name="" entityid="1" refintegrity="false"></role>
<role mincard="1" maxcard="1" name="" entityid="6" refintegrity="false"></role>
</rolelist>
</relationship>
<isa id="48">
<superentity id="6"></superentity>
<subentitylist>
<subentity id="5"></subentity>
<subentity id="10"></subentity>
<subentity id="9"></subentity>
</subentitylist>
</isa>
<entity id="49">
<attributelist>
<attribute id="51"></attribute>
<attribute id="52"></attribute>
<attribute id="53"></attribute>
</attributelist>
</entity>
<relationship id="50">
<rolelist>
<role mincard="1" maxcard="1" name="" entityid="49" refintegrity="false"></role>
<role mincard="0" maxcard="N" name="" entityid="8" refintegrity="false"></role>
</rolelist>
</relationship>
<relationship id="54">
<rolelist>
<role mincard="1" maxcard="1" name="" entityid="1" refintegrity="false"></role>
<role mincard="0" maxcard="N" name="" entityid="4" refintegrity="false"></role>
</rolelist>
</relationship>
</diagram>
Loading