2024/07/12

src/app/card-select/card-info/card-info.component.html

@@ -22,9 +22,34 @@
         <span>カード番号</span>
       </td>
       <td style="padding-top:10px;">
+        <table>
+          <tr>
+            <td>
+              @switch (creditCardModel?.cardKind) {
+              @case (0) {
+              <div class="jcb"></div>
+              }
+              @case (1) {
+              <div class="visa"></div>
+              }
+              @case (2) {
+              <div class="master"></div>
+              }
+              @case (3) {
+              <div class="amex"></div>
+              }
+              @case (4) {
+              <div class="diners"></div>
+              }
+              }
+            </td>
+            <td style="padding-left:10px;">
               <span>****&nbsp;****&nbsp;****&nbsp;{{creditCardModel?.cardNumber}}</span>
             </td>
           </tr>
+        </table>
+      </td>
+    </tr>
     <tr>
       <td style="padding-left:10px;padding-top:10px;">
         <span>カード名義人</span>

src/app/card-select/card-info/card-info.component.scss

+.visa {
+    background-image: url('../../../assets/icon/visa.png');
+    background-repeat: no-repeat;
+    width: 53px;
+    height: 34px;
+}
+
+.master {
+    background-image: url('../../../assets/icon/mastercard.png');
+    background-repeat: no-repeat;
+    width: 53px;
+    height: 34px;
+}
+
+.jcb {
+    background-image: url('../../../assets/icon/jcb.png');
+    background-repeat: no-repeat;
+    width: 44px;
+    height: 34px;
+}
+
+.amex {
+    background-image: url('../../../assets/icon/amex.png');
+    background-repeat: no-repeat;
+    width: 34px;
+    height: 34px;
+}
+
+.diners {
+    background-image: url('../../../assets/icon/diners.png');
+    background-repeat: no-repeat;
+    width: 47px;
+    height: 34px;
+}
\ No newline at end of file

src/app/deny-list/deny-list.module.ts

@@ -9,7 +9,7 @@ import { DenyListPageRoutingModule } from './deny-list-routing.module';
 import { DenyListPage } from './deny-list.page';
 
 import { HeaderComponent } from '../common/header/header.component';
-import { DenyInfoComponent } from './component/deny-info/deny-info.component';
+import { DenyInfoComponent } from './deny-info/deny-info.component';
 
 @NgModule({
   imports: [

src/app/deny-list/deny-list.page.ts

 import { Component, OnInit, QueryList, ViewChildren } from '@angular/core';
 import { DenyListModel } from '../model/deny-list.model';
 import { RouteService } from '../services/route.service';
-import { DenyInfoComponent } from './component/deny-info/deny-info.component';
+import { DenyInfoComponent } from './deny-info/deny-info.component';
 import { DenylistService } from '../services/denylist.service';
 
+/**
+ * 拒否リスト
+ */
 @Component({
   selector: 'app-deny-list',
   templateUrl: './deny-list.page.html',

src/app/history/history.page.ts

@@ -19,7 +19,7 @@ export class HistoryPage implements OnInit {
   /**
    * コンストラクタ
    * @param routeService 画面遷移サービス
-   * @parma historyService 乗降履歴サービス
+   * @param historyService 乗降履歴サービス
    */
   constructor(private routeService: RouteService, private historyService: HistoryService) { }
 

src/app/model/commuter-pass.model.ts

+/**
+ * 定期券情報
+ */
 export class CommuterPassModel {
     //トークンID
     tokenId?: string;

src/app/model/credit-card.model.ts

@@ -5,6 +5,9 @@ export class CreditCardModel {
     //トークンID
     tokenId?: string;
 
+    //カード種類(0:JCB,1:VISA,2:MASTER,3:AMEX,4:DINERS)
+    cardKind?: number;
+
     //カード番号(登録時全番号、それ以外下4桁)
     cardNumber: string = "";
 

src/app/model/deny-list.model.ts

+/**
+ * 拒否リスト情報
+ */
 export class DenyListModel {
     //選択状態
     select: boolean = false;

src/app/model/history.model.ts

+/**
+ * 乗降履歴情報
+ */
 export class HistoryModel {
     //乗降日時
     getonoffDt?: string;

src/app/pass-select/pass-select.module.ts

@@ -10,8 +10,7 @@ import { PassSelectPage } from './pass-select.page';
 
 import { HeaderComponent } from '../common/header/header.component';
 
-import { PassInfoComponent } from './component/pass-info/pass-info.component';
-
+import { PassInfoComponent } from './pass-info/pass-info.component';
 @NgModule({
   imports: [
     CommonModule,

src/app/password-update/password-update.page.ts

 import { Component } from '@angular/core';
 import { RouteService } from '../services/route.service';
+import { UserService } from '../services/user.service';
 
 /**
  * パスワード更新画面
@@ -18,8 +19,9 @@ export class PasswordUpdatePage {
   /**
    * コンストラクタ
    * @param routeService 画面遷移サービス
+   * @param userService 利用者サービス
    */
-  constructor(private routeService: RouteService) { }
+  constructor(private routeService: RouteService, private userService: UserService) { }
 
   /**
    * 閉じる
@@ -33,7 +35,7 @@ export class PasswordUpdatePage {
    */
   onClickUpdate(): void {
     //パスワード更新
-
+    this.userService.changePassword(this.email, this.password);
     this.routeService.navigateHome();
   }
 }

src/app/services/card.service.ts

 import { Injectable } from '@angular/core';
 import { CreditCardModel } from '../model/credit-card.model';
 
+/**
+ * クレジットカードサービス
+ */
 @Injectable({
   providedIn: 'root'
 })
@@ -21,6 +24,7 @@ export class CardService {
       let model: CreditCardModel = new CreditCardModel();
       let value = 1234 + i;
       model.tokenId = String(value);
+      model.cardKind = i;
       model.cardNumber = String(value);
       model.cardOwner = "TARO YAMADA";
       model.cardYear = "2023";

src/app/services/denylist.service.ts

 import { Injectable } from '@angular/core';
 import { DenyListModel } from '../model/deny-list.model';
 
+/**
+ * 拒否リストサービス
+ */
 @Injectable({
   providedIn: 'root'
 })
 export class DenylistService {
-
+  /**
+   * コンストラクタ
+   */
   constructor() { }
 
   /**
@@ -13,6 +18,7 @@ export class DenylistService {
    * @param customerId 利用者ID
    */
   getList(customerId: string): DenyListModel[] {
+    //TODO
     let denyList = new Array();
     for (let i = 0; i < 4; i++) {
       let denyListModel = new DenyListModel();

src/app/services/history.service.ts

 import { Injectable } from '@angular/core';
 import { HistoryModel } from '../model/history.model';
 
+/**
+ * 乗降履歴サービス
+ */
 @Injectable({
   providedIn: 'root'
 })
 export class HistoryService {
-
+  /**
+   * コンストラクタ
+   */
   constructor() { }
 
   /**
@@ -14,6 +19,7 @@ export class HistoryService {
    * @returns 乗降履歴一覧
    */
   getHistoryList(customerId: string): HistoryModel[] {
+    //TODO
     let historyList = new Array();
     for (let i = 0; i < 10; i++) {
       let historyModel: HistoryModel = new HistoryModel();

src/app/services/login.service.ts

 import { Injectable } from '@angular/core';
 import { from, Observable } from 'rxjs';
 
+/**
+ * ログインサービス
+ */
 @Injectable({
   providedIn: 'root'
 })
 export class LoginService {
-
+  /**
+   * コンストラクタ
+   */
   constructor() { }
 
   /**

src/app/services/pass.service.ts

 import { Injectable } from '@angular/core';
 import { CommuterPassModel } from '../model/commuter-pass.model';
-import { KeyValue } from '@angular/common';
 
+/**
+ * 定期券サービス
+ */
 @Injectable({
   providedIn: 'root'
 })
 export class PassService {
-
+  /**
+   * コンストラクタ
+   */
   constructor() { }
 
   /**

src/app/services/user.service.ts

 import { Injectable } from '@angular/core';
 import { UserInfoModel } from '../model/user-info.model';
 
+/**
+ * 利用者サービス
+ */
 @Injectable({
   providedIn: 'root'
 })
@@ -33,7 +36,7 @@ export class UserService {
    * @param model  利用者情報
    */
   regist(model: UserInfoModel): void {
-
+    //TODO
   }
 
   /**
@@ -41,7 +44,7 @@ export class UserService {
    * @param model  利用者情報
    */
   update(model: UserInfoModel): void {
-
+    //TODO
   }
 
   /**
@@ -49,6 +52,15 @@ export class UserService {
    * @param customerId 利用者ID
    */
   withdraw(customerId: string): void {
+    //TODO
+  }
 
+  /**
+   * パスワード変更
+   * @param email メールアドレス
+   * @param password パスワード
+   */
+  changePassword(email?: string, password?: string): void {
+    //TODO
   }
 }