Skip to content

Feature/ticket 29350 #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ivis-oshima wants to merge 11 commits into
base: release
Choose a base branch
from
Open

Feature/ticket 29350 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c9033c7
Add author affiliation managment UI
ivis-oshima Jan 6, 2022
3e59d46
ボタンの言語リソースを統一
ivis-oshima Jan 10, 2022
40204cd
update langJson
ivis-oshima Jan 11, 2022
eb62fe1
Add author affiliation to "Input from author DB"
ivis-oshima Jan 27, 2022
d604ced
fix i18n
ivis-oshima Jan 30, 2022
3e377b6
update seti18n
ivis-oshima Jan 31, 2022
4d00128
update build.sh
ivis-oshima Feb 1, 2022
be011fc
rename variable
ivis-oshima Feb 8, 2022
e0f1ac4
add input regulation of affiliation nameIdentifier
ivis-oshima Mar 4, 2022
668127a
fix delete button
ivis-oshima Mar 9, 2022
192458d
fix page design
ivis-oshima Mar 10, 2022
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
5 changes: 5 additions & 0 deletions app-author-add/src/app/app.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,8 @@
.author-id-add input[type=radio] {
margin-left: 10px;
}

.author-id-add .affiliation-panel{
border-left: transparent;
border-right: transparent;
}
191 changes: 187 additions & 4 deletions app-author-add/src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ <h5>
</div>
<p></p>
</ng-container>
<!-- 第二行目　 end-->
<!-- 第一行目　 end-->
<div class="row ">
<div class="col-sm-11 col-md-11 textRight">
<button type="button" class="btn btn-link" (click)="addAuthorIdInfo()">+&nbsp;
Expand All @@ -167,6 +167,7 @@ <h5>
</button>
</div>
</div>
<!-- 第二行目　 end-->
</div>
</div>
</div>
Expand Down Expand Up @@ -213,19 +214,201 @@ <h5>
</div>
<!--email end -->
<br>
<!-- 所属情報　start -->
<!-- for start -->
<div class="row">
<div class="col-sm-12 col-md-12">
<!-- 第一行目 -->
<ng-container *ngFor="let affiliationData of authorJsonObj.affiliationInfo;let affiliationIndex=index">
<div class="panel panel-default affiliation-panel">
<div class="col-sm-12 col-md-12">
<div class="col-sm-1 col-md-1"></div>
<div class="col-sm-11 col-md-11">
<div class="col-sm-12 col-md-12 divBottom">
<div class="col-sm-11 col-md-11"></div>
<div class="col-sm-1 col-md-1">
<button type="button" class="close delButton" (click)="delAffiliationData(affiliationIndex)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
</div>
</div>
<div class="panel-body">
<div class="col-sm-12 col-md-12">
<br>
<!-- 所属機関識別子　start -->
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="col-sm-1 col-md-1 textRight">
<!-- 所属機関識別子 -->
<!-- Identifier -->
{{langJson.Author_Identifier[1]}}
</div>
<div class="col-sm-11 col-md-11">
<!-- for start -->
<ng-container *ngFor="let identifierData of affiliationData.identifierInfo;let identifierIndex=index">
<div class="">
<div class="col-sm-12 col-md-12 divBottom">
<div class="col-sm-2 col-md-2">
<select class="form-control" id="identifierOption" [(ngModel)]="identifierData.affiliationIdType">
<ng-container *ngFor="let identifierOption of identifierOptions">
<option [value]="identifierOption.id">{{identifierOption.name}}</option>
</ng-container>
</select>
</div>
<div class="col-sm-5 col-md-5">
<input type="text" class="form-control" placeholder="" [(ngModel)]="identifierData.affiliationId">
</div>
<div class="col-sm-2 col-md-2">
<div class="">
<div class="col-sm-12 col-md-12">
<button [disabled]="(!identifierData.affiliationId)" (click)="affiliationConfirm(identifierData.affiliationIdType, identifierData.affiliationId)" type="button" class="btn btn-primary">
<!-- 確認 -->
<!-- Confirm -->
<span class="glyphicon glyphicon-hand-right"></span>
{{langJson.Author_Confirm[1]}}
</button>
</div>
</div>
</div>
<div class="col-sm-2 col-md-2">
<div class="">
<div class="col-sm-12 col-md-12 alignCenter">
<input type="radio" [ngModel]="identifierData.identifierShowFlg" [checked]="identifierData.identifierShowFlg =='true'" (click)="identifierData.identifierShowFlg = 'true'"
name="{{'identifierRadio_'+identifierIndex}}" value="true">&nbsp;
<!-- 表示 -->
<!-- Display -->
{{langJson.Author_Display[1]}}
<input type="radio" [ngModel]="identifierData.identifierShowFlg" [checked]="identifierData.identifierShowFlg == 'false'" (click)="identifierData.identifierShowFlg = 'false'"
name="{{'identifierRadio_'+identifierIndex}}" value="false">&nbsp;
<!-- 非表示 -->
<!-- Hide -->
{{langJson.Author_Hide[1]}}
</div>
</div>
</div>
<div class="col-sm-1 col-md-1">
<div>
<button type="button" class="close delButton" (click)="delIdentifierData(affiliationIndex, identifierIndex)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
</div>
</div>
<p></p>
</ng-container>
<!-- 第二行目 -->
<div class="row ">
<div class="col-sm-11 col-md-11 textRight">
<button type="button" class="btn btn-link" (click)="addIdentifierInfo(affiliationIndex)">+&nbsp;
<!-- 所属機関識別子を追加 -->
<!-- Add Identifier -->
{{langJson.Author_Add_Identifier[1]}}
</button>
</div>
</div>
<!-- 第二行目 end-->
</div>
</div>
</div>
<!-- 所属機関識別子 end -->
<br>
<!-- 所属機関名　start -->
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="col-sm-1 col-md-1 textRight">
<!-- Affiliation Name -->
</div>
<div class="col-sm-11 col-md-11">
<!-- for start -->
<ng-container *ngFor="let affiliationNameData of affiliationData.affiliationNameInfo;let affiliationNameIndex=index">
<div class="">
<div class="col-sm-12 col-md-12 divBottom">
<div class="col-sm-2 col-md-2">
</div>
<div class="col-sm-5 col-md-5">
<input type="text" class="form-control" placeholder="" [(ngModel)]="affiliationNameData.affiliationName">
</div>
<div class="col-sm-2 col-md-2">
<select class="form-control" id="langOption" [(ngModel)]="affiliationNameData.affiliationNameLang" (change)="inputChange(affiliationNameIndex, affiliationNameData.affiliationNameLang)" >
<option *ngFor="let langOption of langOptions" [value]="langOption.id">{{langOption.value}}</option>
</select>
</div>
<div class="col-sm-2 col-md-2">
<div class="">
<div class="col-sm-12 col-md-12 alignCenter">
<input type="radio" [ngModel]="affiliationNameData.affiliationNameShowFlg" [checked]="affiliationNameData.affiliationNameShowFlg =='true'" (click)="affiliationNameData.affiliationNameShowFlg = 'true'"
name="{{'affiliationNameRadio_'+affiliationNameIndex}}" value="true">&nbsp;
<!-- 表示 -->
<!-- Display -->
{{langJson.Author_Display[1]}}
<input type="radio" [ngModel]="affiliationNameData.affiliationNameShowFlg" [checked]="affiliationNameData.affiliationNameShowFlg == 'false'" (click)="affiliationNameData.affiliationNameShowFlg = 'false'"
name="{{'affiliationNameRadio_'+affiliationNameIndex}}" value="false">&nbsp;
<!-- 非表示 -->
<!-- Hide -->
{{langJson.Author_Hide[1]}}
</div>
</div>
</div>
<div class="col-sm-1 col-md-1">
<div>
<button type="button" class="close delButton" (click)="delAffiliationNameData(affiliationIndex, affiliationNameIndex)">
<span class="glyphicon glyphicon-remove"></span>
</button>
</div>
</div>
</div>
</div>
<p></p>
</ng-container>
<!-- 第二行目 -->
<div class="row ">
<div class="col-sm-11 col-md-11 textRight">
<button type="button" class="btn btn-link" (click)="addAffiliationNameInfo(affiliationIndex)">+&nbsp;
<!-- 所属機関名を追加 -->
<!-- Add AffiliationName -->
{{langJson.Author_Add_Affiliation_Name[1]}}
</button>
</div>
</div>
<!-- 第二行目 end-->
</div>
</div>
</div>
<!-- 所属機関名 end -->
</div>
</div>
</div>
</ng-container>
<!-- 第二行目 -->
<div class="row ">
<div class="col-sm-11 col-md-11 textRight">
<button type="button" class="btn btn-link" (click)="addAffiliationInfo()">+&nbsp;
<!-- 所属情報を追加 -->
<!-- Add Affiliation -->
{{langJson.Author_Add_Affiliation[1]}}
</button>
</div>
</div>
<!-- 第二行目　 end-->
</div>
</div>
<!-- 所属情報 end -->
<br>
<br>
<!-- ボタン start-->
<div class="row alignCenter">
<div class="col-sm-1 col-md-1">
<button *ngIf="deleteBtn" type="button" class="btn btn-danger delete-button" (click)="deleteAuthor()">
<button *ngIf="deleteBtn" type="button" class="btn btn-danger delete-button" (click)="deleteAuthor()">
<!-- 削除 -->
<span class="glyphicon glyphicon-trash"></span>
Delete
{{langJson.Author_Button_Delete[1]}}
</button>
</div>
<div class="col-sm-9 col-md-9">
<button type="button" class="btn btn-info clear-button" (click)="clearInputInfo()">
<button type="button" class="btn btn-info clear-button" (click)="clearInputInfo()">
<!-- 取消 -->
<!-- Clear -->
<span class="glyphicon glyphicon-remove"></span>
Expand Down
Loading