This repository has been archived by the owner on Jul 26, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 4
Soldier timeline #172
Open
RahulSherikar
wants to merge
23
commits into
master
Choose a base branch
from
Soldier_Timeline_Viz
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Soldier timeline #172
Changes from all commits
Commits
Show all changes
23 commits
Select commit
Hold shift + click to select a range
84958d1
Soldier timeline code
RahulSherikar 72aafab
Soldier timeline code push to git.
RahulSherikar b95e654
push rivescript code.
RahulSherikar 73f15dc
test coverage code.
RahulSherikar a51f23f
Quality Review changes.
RahulSherikar 6cdb956
additional Quality Review changes.
RahulSherikar fd95304
additional Quality Review changes.
RahulSherikar dff51a2
additional Quality Review changes.
RahulSherikar 55980ac
resolving Codacy/PR Quality Review issues.
RahulSherikar b2502e1
resolving Codacy/PR Quality Review issues.
RahulSherikar d7881b3
resolving "codecov/project" issues.
RahulSherikar 8f5d417
resolving "codecov/project" issues.
RahulSherikar f0343fd
resolving "codecov/project" issues.
RahulSherikar 66a80a3
resolve "continuous-integration/travis-..." issues
RahulSherikar df20908
resolve "continuous-integration/travis-..." issues
RahulSherikar 30a219b
resolve "Codacy/PR Quality Review " issues
RahulSherikar faf175d
resolving "Codacy/PR Quality Review" issues.
RahulSherikar 34165fc
Adding test cases.
RahulSherikar a2f7f80
Resolving codacy issues.
RahulSherikar 7a89ecf
Bug fixes.
RahulSherikar 04e6dcf
Fixing test case.
RahulSherikar 484a7d3
bug fix.
RahulSherikar 86ef5f1
Pulling from master.
RahulSherikar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
ida-chatbot/src/app/components/soldier-timeline/soldier-timeline.component.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; | ||
} | ||
|
||
|
253 changes: 253 additions & 0 deletions
253
ida-chatbot/src/app/components/soldier-timeline/soldier-timeline.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> |
25 changes: 25 additions & 0 deletions
25
ida-chatbot/src/app/components/soldier-timeline/soldier-timeline.component.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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() | ||
}) | ||
}) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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