From 6c9e20295a858f98487686a3b2852a82cef10272 Mon Sep 17 00:00:00 2001
From: 21761200A <treblast5@gmail.com>
Date: Fri, 10 Mar 2017 19:17:49 +0100
Subject: [PATCH] #15 Contact data is taken from Company

---
 .../app/entities/company/companies.html       |  2 ++
 .../entities/contact/contact.controller.js    | 22 ++++++++++++++++---
 .../webapp/app/entities/contact/contacts.html | 13 +++++------
 src/main/webapp/i18n/ca/company.json          |  3 ++-
 src/main/webapp/i18n/en/company.json          |  3 ++-
 src/main/webapp/i18n/es/company.json          |  3 ++-
 6 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/app/entities/company/companies.html b/src/main/webapp/app/entities/company/companies.html
index bb885ea..603a681 100644
--- a/src/main/webapp/app/entities/company/companies.html
+++ b/src/main/webapp/app/entities/company/companies.html
@@ -14,6 +14,8 @@ <h2 data-translate="assessoriaTorrellesApp.company.home.title">Companies</h2>
         </div>
     </div>
     <br/>
+    <h3 data-translate="assessoriaTorrellesApp.company.home.note"></h3>
+    <br/>
     <div class="table-responsive">
         <table class="jh-table table table-striped">
             <thead>
diff --git a/src/main/webapp/app/entities/contact/contact.controller.js b/src/main/webapp/app/entities/contact/contact.controller.js
index 88fa5c5..ae0a4d4 100644
--- a/src/main/webapp/app/entities/contact/contact.controller.js
+++ b/src/main/webapp/app/entities/contact/contact.controller.js
@@ -5,12 +5,20 @@
         .module('assessoriaTorrellesApp')
         .controller('ContactController', ContactController);
 
-    ContactController.$inject = ['$scope', '$state', 'Contact'];
+    ContactController.$inject = ['$scope', '$state', 'Contact', 'Company'];
 
-    function ContactController ($scope, $state, Contact) {
+    function ContactController ($scope, $state, Contact, Company) {
         var vm = this;
-        
+
         vm.contacts = [];
+        vm.companies = [];
+
+        vm.companyInfo = {
+            "name": "",
+            "phone": "",
+            "email": "",
+            "cif": ""
+        };
 
         loadAll();
 
@@ -18,6 +26,14 @@
             Contact.query(function(result) {
                 vm.contacts = result;
             });
+            Company.query(function (result) {
+                vm.companies = result;
+                vm.companyInfo.name = vm.companies[0].name;
+                vm.companyInfo.phone = vm.companies[0].phone;
+                vm.companyInfo.email = vm.companies[0].email;
+                vm.companyInfo.cif = vm.companies[0].cif;
+            });
         }
+
     }
 })();
diff --git a/src/main/webapp/app/entities/contact/contacts.html b/src/main/webapp/app/entities/contact/contacts.html
index 3174a9e..c9aa24a 100644
--- a/src/main/webapp/app/entities/contact/contacts.html
+++ b/src/main/webapp/app/entities/contact/contacts.html
@@ -11,7 +11,6 @@
                             <h2 data-translate="contact.title1"></h2>
                             <h3 data-translate="contact.title2"></h3>
                         </div>
-
                         <div class="blog-text contact">
                             <div class="row">
                                 <div class="col-md-8 col-sm-7">
@@ -39,17 +38,15 @@ <h3 data-translate="contact.title2"></h3>
                                 </div>
                                 <div class="col-md-4 col-sm-5">
                                     <address>
-                                        <strong>AvriqqLabs, Inc.</strong><br>
-                                        231 Yogyakarta, INA 55791<br>
-                                        mail@domain.com<br>
-                                        http://www.domain.com <br>
-                                        <abbr title="Phone">Telp.</abbr> (0274) 441-5000
+                                        <strong>{{vm.companyInfo.name}}</strong><br>
+                                        {{vm.companyInfo.phone}}<br>
+                                        {{vm.companyInfo.email}}<br>
+                                        {{vm.companyInfo.cif}}
                                     </address>
+                                    </div>
                                 </div>
                             </div>
                         </div>
-
-
                     </div>
                 </div>
             </div>
diff --git a/src/main/webapp/i18n/ca/company.json b/src/main/webapp/i18n/ca/company.json
index 895eec0..0b73bef 100644
--- a/src/main/webapp/i18n/ca/company.json
+++ b/src/main/webapp/i18n/ca/company.json
@@ -5,7 +5,8 @@
                 "title": "Companies",
                 "createLabel": "Create a new Company",
                 "createOrEditLabel": "Create or edit a Company",
-                "search": "Search for Company"
+                "search": "Search for Company",
+                "note": "Nota: recorda que la informació de l'empresa ha d'estar a la primera (id=1)."
             },
             "created": "A new Company is created with identifier {{ param }}",
             "updated": "A Company is updated with identifier {{ param }}",
diff --git a/src/main/webapp/i18n/en/company.json b/src/main/webapp/i18n/en/company.json
index 895eec0..68092fe 100644
--- a/src/main/webapp/i18n/en/company.json
+++ b/src/main/webapp/i18n/en/company.json
@@ -5,7 +5,8 @@
                 "title": "Companies",
                 "createLabel": "Create a new Company",
                 "createOrEditLabel": "Create or edit a Company",
-                "search": "Search for Company"
+                "search": "Search for Company",
+                "note": "Note: remember that correct data of the company must be in the first one (id=1)."
             },
             "created": "A new Company is created with identifier {{ param }}",
             "updated": "A Company is updated with identifier {{ param }}",
diff --git a/src/main/webapp/i18n/es/company.json b/src/main/webapp/i18n/es/company.json
index 1195be0..2aea2cc 100644
--- a/src/main/webapp/i18n/es/company.json
+++ b/src/main/webapp/i18n/es/company.json
@@ -5,7 +5,8 @@
                 "title": "Companies",
                 "createLabel": "Crear nuevo Company",
                 "createOrEditLabel": "Crear o editar Company",
-                "search": "Search for Company"
+                "search": "Search for Company",
+                "note": "Nota: recuerda que la información de la empresa debe estar en la primera (id=1)."
             },
             "created": "Un nuevo Company ha sido creado con el identificador {{ param }}",
             "updated": "Un Company ha sido actualizado con el identificador {{ param }}",