Creando herencia Material-alambre-tornillo y tabla MATERIALES, con todos los campos

frontend/src/_redirects

+/*  /index.html 200

frontend/src/app/about/about/about.component.html

 <header class="sticky">
-  <a routerLink="links" class="button">Tutorial Links</a>
-  <a routerLink="info" class="button">More Info</a>
+  <a routerLink="links" class="button">Tutorial Links
+
+  </a>
+  <a routerLink="info" class="button">More Info
+    
+  </a>
+
 </header>
 <router-outlet></router-outlet>

frontend/src/app/about/about/info/info.component.html

-<p>info works!</p>
+<p>Esta es un aplicación para Gestionar un Laboratorio de Prótesis de Ortodoncia</p>

frontend/src/app/about/about/links/links.component.html

-<p>links works!</p>
+<ul class="nav justify-content-center">
+  <li class="nav-item">
+     <a class="nav-link active" href="https://www.boe.es/buscar/doc.php?id=BOE-A-2011-19603"
+     target="-blank">RD 1687/2011 por la que se establece el título de Técnico Superior en Prótesis Dentales</a>
+  </li>
+  <li class="nav-item">
+    <a class="nav-link active" href="https://www.boe.es/buscar/doc.php?id=BOE-A-2009-17606"
+    target="-blank">RD 1591/2009 por la que se regulan los Productos Sanitarios</a>
+ </li>
+</ul>

frontend/src/app/core/shell/footer/footer.component.html

@@ -2,7 +2,7 @@
   <div class="row">
     <div class="col">
       <p>Author: Ernesto Fernandez Novo <br>
-        <a href="mailto:efernov@gmail.com">efernov@gmail.com</a></p>
+        <a href="mailto:novodental@gmail.com">novodental@gmail.com</a></p>
     </div>
     <div class="col justify-content-stretch">
       <img width="50" height="30" src="assets/imagen casita.jpg" alt="casita">
@@ -16,7 +16,7 @@
         <li class="submenu">
           <button type="button" class="btn btn-lg btn-danger" title="Ernesto Fernandez Novo
             ACING (Hoyo de Manzanares)
-            Telefono: 619287832">Contacto</button>
+            Telefono: 675345685">Contacto</button>
         </li>
        </ul>
       </article>

frontend/src/app/core/shell/header/header.component.html

@@ -19,7 +19,7 @@
        </ul>
        <ul class="nav justify-content-center">
         <li class="nav-item"><img class="nav-link" width="70" height="50" src="assets/facebook.png" alt="facebook"></li>
-         <li class="nav-item"><a class="nav-link active" href="https://www.facebook.com/" target="-blank">facebook</a></li>
+         <li class="nav-item"><a class="nav-link active" href="https://es-es.facebook.com/MinisterioDefensaESP" target="-blank">facebook</a></li>
        </ul>
      </div>
    </div>

src/main/java/novodental/entidades/Alambre.java → src/main/java/novodental/entidades/AlambreConId.java

@@ -2,21 +2,25 @@ package novodental.entidades;
 
 
 
-import org.springframework.stereotype.Component;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
 
 
 
-@Component
-public class Alambre extends Material{
-	
 
-	private float diametroMilimetro;
+//@Entity
+public class AlambreConId extends MaterialConId {
+	
+private float diametroMilimetro;
 	private int longitudCentimetro;
 	
-	public Alambre() {
+	public AlambreConId() {
+		super();
 	}
 
-	public Alambre(float diametroMilimetro, int longitudCentimetro) {
+	public AlambreConId(float diametroMilimetro, int longitudCentimetro) {
 		super();
 		this.diametroMilimetro = diametroMilimetro;
 		this.longitudCentimetro = longitudCentimetro;

src/main/java/novodental/entidades/Material.java → src/main/java/novodental/entidades/MaterialConId.java

 package novodental.entidades;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+public class MaterialConId {
 
-@Entity
-public class Material {
-
-	@Id
-	@GeneratedValue
 	protected int id;
 	protected float precio;
 
-
-	public Material() {
+	public MaterialConId() {
 		super();
 	}
 
@@ -33,7 +25,10 @@ public class Material {
 		this.precio = precio;
 	}
 
-
+	@Override
+	public String toString() {
+		return "MaterialConId [id=" + id + ", precio=" + precio + "]";
+	}
 
 	
 }
\ No newline at end of file

src/main/java/novodental/entidades/Ortodoncia.java → src/main/java/novodental/entidades/OrtodonciaConId.java

@@ -10,7 +10,7 @@ import javax.persistence.Id;
 
 
 @Entity
-public class Ortodoncia {
+public class OrtodonciaConId {
 	
 	@Id
 	@GeneratedValue
@@ -22,7 +22,7 @@ public class Ortodoncia {
 //	private Collection<Material> materiales;
 	
 	
-	public Ortodoncia() {
+	public OrtodonciaConId() {
 		super();
 	}
 

src/main/java/novodental/entidades/Tornillo.java → src/main/java/novodental/entidades/TornilloConId.java

@@ -2,22 +2,29 @@ package novodental.entidades;
 
 
 
-import org.springframework.stereotype.Component;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
 
 
 
-@Component
-public class Tornillo extends Material {
+
+
+//@Entity
+public class TornilloConId extends MaterialConId{
+	
 	
+//	@Id
+//	@GeneratedValue
 	
 	private String direccionApertura;
 	private int aperturaMilimetros;
 	
-	public Tornillo() {
+	public TornilloConId() {
 		super();
 	}
 	
-	public Tornillo(String direccionApertura, int aperturaMilimetros) {
+	public TornilloConId(String direccionApertura, int aperturaMilimetros) {
 		super();
 		this.direccionApertura = direccionApertura;
 		this.aperturaMilimetros = aperturaMilimetros;

src/main/java/novodental/novodental/ConfiguracionPorJava.java

@@ -3,22 +3,22 @@ package novodental.novodental;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import novodental.entidades.Alambre;
-import novodental.entidades.Material;
-import novodental.entidades.Tornillo;
+import novodental.entidades.AlambreConId;
+import novodental.entidades.MaterialConId;
+import novodental.entidades.TornilloConId;
 
 
 @Configuration
 public class ConfiguracionPorJava {
 	
 	@Bean
-	public Material getTornillo() {
-		Material tornillo = new Tornillo();
+	public TornilloConId getTornillo() {
+		TornilloConId tornillo = new TornilloConId();
 		return tornillo;
 	}
 	@Bean
-	public Alambre getAlambre() {
-		Alambre alambre = new Alambre();
+	public MaterialConId getAlambre() {
+		MaterialConId alambre = new AlambreConId();
 		return alambre;
 	}
 	

src/main/java/novodental/novodental/NovodentalApplication.java

@@ -6,10 +6,10 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportResource;
 
-import novodental.entidades.Alambre;
-import novodental.entidades.Material;
-import novodental.entidades.Tornillo;
-import novodental.repositorios.MaterialDAO;
+import novodental.entidades.AlambreConId;
+import novodental.entidades.MaterialConId;
+import novodental.entidades.TornilloConId;
+
 import novodental.repositorios.OrtodonciaDAO;
 
 
@@ -21,29 +21,29 @@ public class NovodentalApplication {
 	public static void main(String[] args) {
 	ConfigurableApplicationContext context = SpringApplication.run(NovodentalApplication.class, args);
 	
-		MaterialDAO materialDAO = context.getBean(MaterialDAO.class);
-		materialDAO.save(generarMaterial());
-		System.out.println(materialDAO);
+//		MaterialDAO materialDAO = context.getBean(MaterialDAO.class);
+//		materialDAO.save(generarMaterial());
+//		System.out.println(materialDAO);
 		
 		OrtodonciaDAO ortodonciaDAO = context.getBean(OrtodonciaDAO.class);
 		System.out.println(ortodonciaDAO);
 	
-		Material beanTornillo = context.getBean(Tornillo.class);
+		TornilloConId beanTornillo = context.getBean(TornilloConId.class);
 		System.out.println(beanTornillo);
 		
-		Alambre beanAlambre = context.getBean(Alambre.class);
+		MaterialConId beanAlambre = context.getBean(AlambreConId.class);
 		System.out.println(beanAlambre);
 		
 		//context.close();
 	}
 
-	public static Material generarMaterial() {
-		Material material = new Material();
-//		material.setId(2);
-		material.setPrecio(1.4f);
-//		material.setAlambre(material.getAlambre(0.10f, 20));
-//		material.setTornillo(material.getTornillo("bidireccional", 10));
-		return material;
-		
-	}
+//	public static Material generarMaterial() {
+//		Material material = new Material();
+////		material.setId(2);
+//		material.setPrecio(1.4f);
+////		material.setAlambre(material.getAlambre(0.10f, 20));
+////		material.setTornillo(material.getTornillo("bidireccional", 10));
+//		return material;
+//		
+//	}
 }

src/main/java/novodental/repositorios/MaterialDAO.java → src/main/java/novodental/repositorios/AlambreDAO.java

@@ -3,10 +3,10 @@ package novodental.repositorios;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import novodental.entidades.Material;
+import novodental.entidades.AlambreConId;
+
 
 @Repository
-public interface MaterialDAO extends JpaRepository<Material, Integer>{
-	
+public interface AlambreDAO extends JpaRepository<AlambreConId, Integer>{
 
 }

src/main/java/novodental/repositorios/OrtodonciaDAO.java

@@ -3,10 +3,10 @@ package novodental.repositorios;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import novodental.entidades.Ortodoncia;
+import novodental.entidades.OrtodonciaConId;
 
 
 @Repository
-public interface OrtodonciaDAO extends JpaRepository<Ortodoncia, Integer>{
+public interface OrtodonciaDAO extends JpaRepository<OrtodonciaConId, Integer>{
 
 }

src/main/java/novodental/repositorios/TornilloDAO.java

+package novodental.repositorios;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import novodental.entidades.TornilloConId;
+
+
+@Repository
+public interface TornilloDAO extends JpaRepository<TornilloConId, Integer>{
+
+}
+

src/main/resources/config/jpa-config.xml

@@ -17,8 +17,9 @@
         <!-- Decimos como se mapean de Java a BD y viceversa -->
         <property name="mappingResources">
             <list>
-               <!--  <value>jpa/IdentificableString.orm.xml</value> -->
-               
+                <value>jpa/AlambreConId.orm.xml</value> 
+                <value>jpa/TornilloConId.orm.xml</value> 
+                <value>jpa/MaterialConId.orm.xml</value>
             </list>
         </property>
         <property name="jpaVendorAdapter">

src/main/resources/jpa/AlambreConId.orm.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings
+	xmlns="http://java.sun.com/xml/ns/persistence/orm"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
+	version="1.0">
+	<entity class="novodental.entidades.AlambreConId" access="FIELD">
+		<table name="MATERIALES" />
+		<attributes>
+			<basic name="diametroMilimetro" optional="false">
+			  <column name="DIAMETRO"/>
+			</basic>
+			<basic name="longitudCentimetro" optional="false">
+			  <column name="LONGITUD"/>
+			</basic>
+		</attributes>
+	</entity>
+</entity-mappings>

src/main/resources/jpa/MaterialConId.orm.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings
+	xmlns="http://java.sun.com/xml/ns/persistence/orm"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
+	version="1.0">
+	<mapped-superclass class="novodental.entidades.MaterialConId" access="FIELD">
+		
+		<attributes>
+			<id name="id">
+				<!-- <generated-value strategy="IDENTITY"/> -->
+			</id>
+			<basic name="precio" optional="false"></basic>
+			
+		</attributes>
+	</mapped-superclass>
+</entity-mappings>
\ No newline at end of file

src/main/resources/jpa/TornilloConId.orm.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<entity-mappings
+	xmlns="http://java.sun.com/xml/ns/persistence/orm"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
+	version="1.0">
+	<entity class="novodental.entidades.TornilloConId" access="FIELD">
+		<table name="MATERIALES" />
+		<attributes>
+			<basic name="direccionApertura" optional="false">
+			  <column name="DIRECCION"/>
+			</basic>
+			<basic name="aperturaMilimetros" optional="false">
+			  <column name="APERTURA"/>
+			</basic>
+		</attributes>
+	</entity>
+</entity-mappings>