aboutsummaryrefslogtreecommitdiffstats
path: root/src/app/about-us
diff options
context:
space:
mode:
authorsj108s <sj108s@us.att.com>2018-04-02 14:46:25 +0530
committerSkip Wonnell <skip@att.com>2018-04-03 09:23:23 -0500
commitf27d5549734324727a5432f6ff663b0880425f47 (patch)
tree4e4e2908965513412048e468eb7e241ebfe5c8db /src/app/about-us
parentebec20faa45e710f52ee0f29eccd05adec35762e (diff)
Corrected artifact name for multiple template ids
Made changes in param name value component ts for setting correct artifact name while saving and retrieving artifacts, in case of multiple template ids. Issue-ID: APPC-812 Change-Id: I973f7b763f4c2204425fceb77cdae33944ba3c8d Signed-off-by: sj108s <sj108s@us.att.com>
Diffstat (limited to 'src/app/about-us')
-rw-r--r--src/app/about-us/aboutus.component.html41
-rw-r--r--src/app/about-us/aboutus.component.spec.ts21
-rw-r--r--src/app/about-us/aboutus.component.ts5
3 files changed, 25 insertions, 42 deletions
diff --git a/src/app/about-us/aboutus.component.html b/src/app/about-us/aboutus.component.html
index 1d8134b..3c2fb52 100644
--- a/src/app/about-us/aboutus.component.html
+++ b/src/app/about-us/aboutus.component.html
@@ -17,7 +17,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
============LICENSE_END============================================
-->
@@ -28,8 +27,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<div class="card-header" style="font-size: 20px">CONTACT DETAILS</div>
<div class="mdl-card__title">
<div class="text-center">
- Contact us @: <a href="#">APPC
- DEVELOPMENT TEAM </a>
+ Contact us @:<a href="mailto:{{contactUsMail.CONTACT_US_EMAIL}}?Subject={{contactUsMail.CONTACT_US_SUBJECT}}">APPC DEVELOPMENT TEAM</a>
</div>
</div>
</div>&emsp;&emsp;&emsp;&emsp;
@@ -39,29 +37,28 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<table>
<thead></thead>
<tbody>
- <tr>
- <td>
- <div class="android-title mdl-layout-title">Current Release :</div>
- </td>
- <td>
- <div class="android-title mdl-layout-title">{{releaseName}}</div>
- </td>
- </tr>
- <tr>
- <td>
- <div class="android-title mdl-layout-title">Current Version :</div>
- </td>
- <td>
- <div class="android-title mdl-layout-title">{{versionNo}}</div>
- </td>
- </tr>
+ <tr>
+ <td>
+ <div class="android-title mdl-layout-title">Current Release :</div>
+ </td>
+ <td>
+ <div class="android-title mdl-layout-title">{{releaseName}}</div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div class="android-title mdl-layout-title">Current Version :</div>
+ </td>
+ <td>
+ <div class="android-title mdl-layout-title">{{versionNo}}</div>
+ </td>
+ </tr>
</tbody>
</table>
</div>
<div class="text-right">
<div class="mdl-dialog__content">
- <a class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--primary"
- (click)="open(content)" (click)="versionLogFile()">VIEW CHANGE LOG</a>
+ <a class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--primary" (click)="open(content)" (click)="versionLogFile()">VIEW CHANGE LOG</a>
</div>
</div>
@@ -84,7 +81,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<html>
<body>
- <textarea class="textarea">{{this.data}}</textarea>
+ <textarea class="textarea">{{this.data}}</textarea>
</body>
</html>
diff --git a/src/app/about-us/aboutus.component.spec.ts b/src/app/about-us/aboutus.component.spec.ts
index 175f8d1..9f71c8f 100644
--- a/src/app/about-us/aboutus.component.spec.ts
+++ b/src/app/about-us/aboutus.component.spec.ts
@@ -17,9 +17,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
============LICENSE_END============================================
*/
+
import { async, ComponentFixture, TestBed, inject, tick, fakeAsync } from '@angular/core/testing';
import { Http, HttpModule, ConnectionBackend, BaseRequestOptions, Response, ResponseOptions } from '@angular/http';
import { MockBackend } from '@angular/http/testing';
@@ -55,9 +55,7 @@ describe('ContacUsComponent', () => {
{ provide: MockBackend, useClass: MockBackend },
{ provide: BaseRequestOptions, useClass: BaseRequestOptions },
{provide: Http, useValue: http}]
-
- })
- .compileComponents();
+ }).compileComponents();
}));
beforeEach(() => {
@@ -70,26 +68,15 @@ describe('ContacUsComponent', () => {
expect(component).toBeTruthy();
});
- it('test', inject([Http], (http: Http) => {
- let spy = spyOn(http, 'get').and.returnValue(Observable.of('some value'))
-
- component.versionLogFile();
-
- expect(http).toBeTruthy();
- expect(spy).toHaveBeenCalled()
-
- }));
-
it('should open modal', inject([NgbModule],(ngbModule: NgbModule) => {
- let content = 'test';
- component.open(content);
+ let content = 'test';
+ component.open(content);
}));
it('should download log file', () => {
var blob = new Blob(['test'], {
type: 'text/plain;charset=utf-8'
});
-
component.downloadLogFile();
});
});
diff --git a/src/app/about-us/aboutus.component.ts b/src/app/about-us/aboutus.component.ts
index 1c237e8..de983c7 100644
--- a/src/app/about-us/aboutus.component.ts
+++ b/src/app/about-us/aboutus.component.ts
@@ -16,8 +16,6 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
============LICENSE_END============================================
*/
@@ -36,7 +34,7 @@ export class AboutUsComponent implements OnInit {
public releaseName: any;
public versionNo: any;
-
+ public contactUsMail: any;
public data: any;
closeResult: string;
@@ -46,6 +44,7 @@ export class AboutUsComponent implements OnInit {
ngOnInit() {
this.versionNo = require('./appVersion.json').versionNo;
this.releaseName = require('./appVersion.json').releaseName;
+ this.contactUsMail = require('../cdt.application.properties.json').CONTACT_US;
}
versionLogFile() {