Skip to content
This repository has been archived by the owner on Jul 26, 2023. It is now read-only.

Soldier timeline #172

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
84958d1
Soldier timeline code
RahulSherikar Jan 2, 2020
72aafab
Soldier timeline code push to git.
RahulSherikar Jan 2, 2020
b95e654
push rivescript code.
RahulSherikar Jan 2, 2020
73f15dc
test coverage code.
RahulSherikar Jan 2, 2020
a51f23f
Quality Review changes.
RahulSherikar Jan 2, 2020
6cdb956
additional Quality Review changes.
RahulSherikar Jan 2, 2020
fd95304
additional Quality Review changes.
RahulSherikar Jan 2, 2020
dff51a2
additional Quality Review changes.
RahulSherikar Jan 2, 2020
55980ac
resolving Codacy/PR Quality Review issues.
RahulSherikar Jan 11, 2020
b2502e1
resolving Codacy/PR Quality Review issues.
RahulSherikar Jan 11, 2020
d7881b3
resolving "codecov/project" issues.
RahulSherikar Jan 11, 2020
8f5d417
resolving "codecov/project" issues.
RahulSherikar Jan 11, 2020
f0343fd
resolving "codecov/project" issues.
RahulSherikar Jan 11, 2020
66a80a3
resolve "continuous-integration/travis-..." issues
RahulSherikar Jan 12, 2020
df20908
resolve "continuous-integration/travis-..." issues
RahulSherikar Jan 12, 2020
30a219b
resolve "Codacy/PR Quality Review " issues
RahulSherikar Jan 12, 2020
faf175d
resolving "Codacy/PR Quality Review" issues.
RahulSherikar Jan 12, 2020
34165fc
Adding test cases.
RahulSherikar Jan 12, 2020
a2f7f80
Resolving codacy issues.
RahulSherikar Jan 12, 2020
7a89ecf
Bug fixes.
RahulSherikar Jan 12, 2020
04e6dcf
Fixing test case.
RahulSherikar Jan 12, 2020
484a7d3
bug fix.
RahulSherikar Jan 14, 2020
86ef5f1
Pulling from master.
RahulSherikar Jan 19, 2020
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
29 changes: 16 additions & 13 deletions ida-chatbot/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import {Component, ElementRef, QueryList, ViewChild, ViewChildren} from '@angular/core';
import {Message} from './models/message';
import {ResponseBean} from './models/response-bean';
import {SidebarComponent} from './components/sidebar/sidebar.component';
import {MainviewElement} from './models/mainview-element';
import {SidebarElement} from './models/sidebar-element';
import {ChatboxComponent} from './components/chatbox/chatbox.component';
import {RestService} from './service/rest/rest.service';
import {DataViewContainerComponent} from './components/data-view-container/data-view-container.component';
import {TabElement} from './models/tab-element';
import {UniqueIdProviderService} from './service/misc/unique-id-provider.service';
import {TabType} from './enums/tab-type.enum';
import {IdaEventService} from './service/event/ida-event.service';
import { Component, ElementRef, QueryList, ViewChild, ViewChildren } from '@angular/core'
import { Message } from './models/message'
import { ResponseBean } from './models/response-bean'
import { SidebarComponent } from './components/sidebar/sidebar.component'
import { MainviewElement } from './models/mainview-element'
import { SidebarElement } from './models/sidebar-element'
import { ChatboxComponent } from './components/chatbox/chatbox.component'
import { RestService } from './service/rest/rest.service'
import { DataViewContainerComponent } from './components/data-view-container/data-view-container.component'
import { TabElement } from './models/tab-element'
import { UniqueIdProviderService } from './service/misc/unique-id-provider.service'
import { TabType } from './enums/tab-type.enum'
import { IdaEventService } from './service/event/ida-event.service'

@Component({
selector: 'app-root',
Expand Down Expand Up @@ -78,6 +78,9 @@ export class AppComponent {
// Open new tab with DataTable
const newTab = new TabElement(this.uis.getUniqueId(), resp.payload.actvTbl, TabType.SSB, resp.payload.ssbDiagramData, true, true);
this.addNewTab(newTab, resp);
} else if (resp.actnCode === 10) {
const newTab = new TabElement(this.uis.getUniqueId(),'Soldier Career Timeline', TabType.SCTL, resp.payload.soldierTimeLineData, true, true)
this.addNewTab(newTab, resp)
}
}

Expand Down
5 changes: 4 additions & 1 deletion ida-chatbot/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ import { VennViewComponent } from './components/venn-view/venn-view.component';
import { DeckglHexViewComponent } from './components/deckgl-hex-view/deckgl-hex-view.component';
import { SpeechInputComponent } from './components/speech-input/speech-input.component';
import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
import { SoldierTimelineComponent } from './components/soldier-timeline/soldier-timeline.component'
@NgModule({
declarations: [
AppComponent,
Expand All @@ -81,12 +82,14 @@ import {NgbModule} from '@ng-bootstrap/ng-bootstrap';
SsbViewComponent,
VennViewComponent,
DeckglHexViewComponent,
SpeechInputComponent
SpeechInputComponent,
SoldierTimelineComponent
],
imports: [
BrowserModule,
BrowserAnimationsModule,
FormsModule,
ReactiveFormsModule,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this component is needed

HttpModule,
HttpClientModule,
CdkTableModule,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.soldierInfoDiv {
position: relative;
bottom: 34px;
left: 265px;
font-size: 18px;
width:275px;
}

.fieldLabelClass {
font-size: 20px;
}


Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
<mat-toolbar color="primary">
<mat-toolbar-row>
<div style="width: 100%; height: 20%;">
<h1 align='center'>Soldier Career Timeline</h1>
</div>
</mat-toolbar-row>
</mat-toolbar>

<mat-horizontal-stepper #stepper>

<mat-step *ngFor="let i of allDates">

<ng-template *ngIf="allDOB.includes(i)" matStepLabel>{{dateCorectValue.get(i)}} DOB</ng-template>
<ng-template *ngIf="allDatesOfRank.includes(i)" matStepLabel>{{dateCorectValue.get(i)}} Rank</ng-template>
<ng-template *ngIf="allDatesOfRegiment.includes(i)" matStepLabel>{{dateCorectValue.get(i)}} Regiment</ng-template>
<ng-template *ngIf="allDatesOfDecoration.includes(i)" matStepLabel>{{dateCorectValue.get(i)}} Decoration</ng-template>
<ng-template *ngIf="allDOD.includes(i)" matStepLabel>{{dateCorectValue.get(i)}} DOD</ng-template>


<mat-card *ngIf="allDOB.includes(i)">
<div id="soldierInformationId" style="border-radius: 8px;padding-top: 9px;">
<mat-card-title >Date of Birth</mat-card-title>
</div>

<div id="soldierInfoTagsId" style=" text-align: justify;overflow: auto;display: block;border-radius: 8px;">
<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">Date : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{dateCorectValue.get(i)}}</div>
</div>

<!-- <div class="soldierInfoDivClass">
<mat-card-subtitle>Plcae:</mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDOBInfo.get(i).get("place")}}</div>
</div> -->
</div>
</mat-card>

<mat-card *ngIf="allDatesOfRank.includes(i)">
<div id="soldierInformationId" style="border-radius: 8px;padding-top: 9px;">
<mat-card-title>Rank Information</mat-card-title>
</div>

<div id="soldierInfoTagsId" style=" text-align: justify;overflow: auto;display: block;border-radius: 8px;">
<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">Date: </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("applicableFrom_inXSDDate")}}</div>
</div>

<!--<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">ID : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("id")}}</div>
</div> -->

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass" >Rank Name : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("hasRank_name")}}</div>
</div>

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass" >Rank Sortation : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("hasRank_sortation")}}</div>
</div>


<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">Label :</mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("label")}}</div>
</div>

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">Rank Id : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("hasRank_id")}}</div>
</div>

<!--<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">Rank Label : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("hasRank_label")}}</div>
</div> -->

</div>
</mat-card>

<mat-card *ngIf="allDatesOfRegiment.includes(i)">
<div id="soldierInformationId" style="border-radius: 8px;padding-top: 9px;">
<mat-card-title>Regiment Information</mat-card-title>
</div>

<div id="soldierInfoTagsId" style=" text-align: justify;overflow: auto;display: block;border-radius: 8px;">
<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass" >Date : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("applicableFrom_inXSDDate")}}</div>
</div>

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">ID : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("id")}}</div>
</div>

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">Regiment Info Name : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("regimentInfo_name")}}</div>
</div>

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">Regiment Info Id : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("regimentInfo_id")}}</div>
</div>

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">Label :</mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("label")}}</div>
</div>

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">Regiment Info Abbreviation : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("regimentInfo_abbreviation")}}</div>
</div>



<!--<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">Regiment Info Label : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("regimentInfo_label")}}</div>
</div> -->


</div>


</mat-card>

<mat-card *ngIf="allDatesOfDecoration.includes(i)">
<div id="soldierInformationId" style="border-radius: 8px;padding-top: 9px;">
<mat-card-title>Decoration Information</mat-card-title>
</div>

<div id="soldierInfoTagsId" style=" text-align: justify;overflow: auto;display: block;border-radius: 8px;">
<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass" >Date : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("applicableFrom_inXSDDate")}}</div>
</div>

<!-- <div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">ID : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("id")}}</div>
</div> -->

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass" >Decoration Name : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("hasDecoration_name")}}</div>
</div>

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass" >Decoration Id : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("hasDecoration_id")}}</div>
</div>

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">Label :</mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("label")}}</div>
</div>

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass" >Decoration Abbreviation : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("hasDecoration_abbreviation")}}</div>
</div>



<!--<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass" >Decoration Label : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDatesVsFileds.get(i).get("hasDecoration_label")}}</div>
</div> -->


</div>

</mat-card>

<mat-card *ngIf="allDOD.includes(i)">
<div id="soldierInformationId" style="border-radius: 8px;padding-top: 9px;">
<mat-card-title>Date of Death</mat-card-title>
</div>

<div id="soldierInfoTagsId" style=" text-align: justify;overflow: auto;display: block;border-radius: 8px;">
<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass" >Date : </mat-card-subtitle>
<div class="soldierInfoDiv"> {{dateCorectValue.get(i)}}</div>
</div>

<!-- <div class="soldierInfoDivClass">
<mat-card-subtitle>Plcae:</mat-card-subtitle>
<div class="soldierInfoDiv"> {{soldierDODPlace}}</div>
</div> -->
</div>
</mat-card>

<br/>

<div>
<button mat-raised-button matStepperPrevious>Back</button>
<button mat-raised-button matStepperNext>Next</button>
</div>
</mat-step>


</mat-horizontal-stepper>

<mat-card>
<div id="soldierInformationId" style="border-radius: 8px;padding-top: 9px;">
<mat-card-title>Soldier Information</mat-card-title>
</div>

<div id="soldierInfoTagsId" style=" text-align: justify;overflow: auto;display: block;border-radius: 8px;">

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">Full Name :</mat-card-subtitle>
<div class="soldierInfoDiv" >{{soldierData.basicInfo__0.label}}</div>
</div>

<!-- <div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">First Name :</mat-card-subtitle>
<div class="soldierInfoDiv" >{{soldierData.basicInfo__0.firstName}}</div>
</div>

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">Last Name :</mat-card-subtitle>
<div class="soldierInfoDiv" >{{soldierData.basicInfo__0.lastName}}</div>
</div> -->

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">ID :</mat-card-subtitle>
<div class="soldierInfoDiv" >{{soldierData.basicInfo__0.id}}</div>
</div>

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass" >DALVerified :</mat-card-subtitle>
<div class="soldierInfoDiv" >{{soldierData.basicInfo__0.DALVerified}}</div>
</div>

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">NSDAPNumber :</mat-card-subtitle>
<div class="soldierInfoDiv" >{{soldierData.basicInfo__0.NSDAPNumber}}</div>
</div>

<div class="soldierInfoDivClass">
<mat-card-subtitle class="fieldLabelClass">Membership Number :</mat-card-subtitle>
<div class="soldierInfoDiv" >{{soldierData.basicInfo__0.membershipNumber}}</div>
</div>

</div>

</mat-card>
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing'

import { SoldierTimelineComponent } from './soldier-timeline.component'

describe('SoldierTimelineComponent', () => {
let component: SoldierTimelineComponent
let fixture: ComponentFixture<SoldierTimelineComponent>

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ SoldierTimelineComponent ]
})
.compileComponents()
}))

beforeEach(() => {
fixture = TestBed.createComponent(SoldierTimelineComponent)
component = fixture.componentInstance
fixture.detectChanges()
})

it('should create', () => {
expect(component).toBeTruthy()
})
})
Loading