Skip to content

C
contactless-angular
Commit ae65864c authored by 伊藤雄大's avatar 伊藤雄大
Browse files
Options

2024/07/10

　売上一覧追加
parent f9119eaf
Hide whitespace changes
Inline Side-by-side
Showing with 388 additions and 195 deletions
angular.json
View file @ ae65864c
...@@ -113,8 +113,22 @@ ...@@ -113,8 +113,22 @@
"node_modules/jquery/dist/jquery.min.js" "node_modules/jquery/dist/jquery.min.js"
] ]
} }
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
} }
} }
} }
},
"cli": {
"schematicCollections": [
"@angular-eslint/schematics"
]
} }
} }
\ No newline at end of file
package-lock.json
View file @ ae65864c
This source diff could not be displayed because it is too large. You can view the blob instead.
package.json
View file @ ae65864c
...@@ -6,11 +6,12 @@ ...@@ -6,11 +6,12 @@
"start": "ng serve", "start": "ng serve",
"build": "ng build", "build": "ng build",
"watch": "ng build --watch --configuration development", "watch": "ng build --watch --configuration development",
"test": "ng test" "test": "ng test",
"lint": "ng lint"
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "^18.0.0", "@angular/animations": "^18.0.3",
"@angular/cdk": "^18.0.3", "@angular/cdk": "^18.0.3",
"@angular/common": "^18.0.0", "@angular/common": "^18.0.0",
"@angular/compiler": "^18.0.0", "@angular/compiler": "^18.0.0",
...@@ -26,6 +27,7 @@ ...@@ -26,6 +27,7 @@
"bootstrap": "^5.3.2", "bootstrap": "^5.3.2",
"jquery": "^3.7.1", "jquery": "^3.7.1",
"jqwidgets-ng": "^19.2.2", "jqwidgets-ng": "^19.2.2",
"ngx-bootstrap": "^6.2.0",
"rxjs": "~7.8.0", "rxjs": "~7.8.0",
"tslib": "^2.3.0", "tslib": "^2.3.0",
"zone.js": "~0.14.3" "zone.js": "~0.14.3"
...@@ -36,12 +38,15 @@ ...@@ -36,12 +38,15 @@
"@angular/compiler-cli": "^18.0.0", "@angular/compiler-cli": "^18.0.0",
"@angular/localize": "^18.0.0", "@angular/localize": "^18.0.0",
"@types/jasmine": "~5.1.0", "@types/jasmine": "~5.1.0",
"angular-eslint": "18.0.1",
"eslint": "^9.3.0",
"jasmine-core": "~5.1.0", "jasmine-core": "~5.1.0",
"karma": "~6.4.0", "karma": "~6.4.0",
"karma-chrome-launcher": "~3.2.0", "karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.0", "karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0", "karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0", "karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.4.2" "typescript": "~5.4.2",
"typescript-eslint": "8.0.0-alpha.20"
} }
} }
\ No newline at end of file
src/app/app.module.ts
View file @ ae65864c
...@@ -7,6 +7,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'; ...@@ -7,6 +7,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { jqxGridModule } from 'jqwidgets-ng/jqxgrid'; import { jqxGridModule } from 'jqwidgets-ng/jqxgrid';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CdkListbox, CdkOption } from '@angular/cdk/listbox'; import { CdkListbox, CdkOption } from '@angular/cdk/listbox';
import { AgGridAngular } from 'ag-grid-angular';
import { TopComponent } from './top/top.component'; import { TopComponent } from './top/top.component';
import { HeaderComponent } from './header/header.component'; import { HeaderComponent } from './header/header.component';
...@@ -16,7 +17,28 @@ import { StaffListComponent } from './menu/staff-list/staff-list.component'; ...@@ -16,7 +17,28 @@ import { StaffListComponent } from './menu/staff-list/staff-list.component';
import { UserListComponent } from './menu/user-list/user-list.component'; import { UserListComponent } from './menu/user-list/user-list.component';
import { RoleMstComponent } from './menu/master/role-mst/role-mst.component'; import { RoleMstComponent } from './menu/master/role-mst/role-mst.component';
import { PassFareComponent } from './menu/master/pass-fare/pass-fare.component'; import { PassFareComponent } from './menu/master/pass-fare/pass-fare.component';
import { StaffRegistComponent } from './menu/staff-regist/staff-regist.component' import { StaffRegistComponent } from './menu/staff-regist/staff-regist.component';
import { CustomButtonComponent } from './menu/staff-list/custom-button/custom-button.component';
import { PassButtonComponent } from './menu/user-list/pass-button/pass-button.component';
import { HistoryButtonComponent } from './menu/user-list/history-button/history-button.component';
import { DenylistButtonComponent } from './menu/user-list/denylist-button/denylist-button.component';
import { PassListComponent } from './menu/pass-list/pass-list.component';
import { RefundButtonComponent } from './menu/pass-list/refund-button/refund-button.component';
import { PassRefundComponent } from './menu/pass-list/pass-refund/pass-refund.component';
import { HistoryListComponent } from './menu/history-list/history-list.component';
import { StatusLinkComponent } from './menu/history-list/status-link/status-link.component';
import { StatusUpdateComponent } from './menu/history-list/status-update/status-update.component';
import { DenyListComponent } from './menu/deny-list/deny-list.component';
import { EarningListComponent } from './menu/earning-list/earning-list.component';
import { CardRendererComponent } from './menu/earning-list/card-renderer/card-renderer.component';
import { ProcessDatetimeComponent } from './menu/earning-list/processdatetime/processdatetime.component';
import { EarningDateComponent } from './menu/earning-list/earning-date/earning-date.component';
import { GetonDatetimeComponent } from './menu/earning-list/geton-datetime/geton-datetime.component';
import { GetoffDatetimeComponent } from './menu/earning-list/getoff-datetime/getoff-datetime.component';
import { StatusComponent } from './menu/earning-list/status/status.component';
import { NgComponent } from './menu/earning-list/ng/ng.component';
import { DelreqComponent } from './menu/earning-list/delreq/delreq.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
AppComponent, AppComponent,
...@@ -27,7 +49,27 @@ import { StaffRegistComponent } from './menu/staff-regist/staff-regist.component ...@@ -27,7 +49,27 @@ import { StaffRegistComponent } from './menu/staff-regist/staff-regist.component
UserListComponent, UserListComponent,
RoleMstComponent, RoleMstComponent,
PassFareComponent, PassFareComponent,
StaffRegistComponent StaffRegistComponent,
CustomButtonComponent,
PassButtonComponent,
HistoryButtonComponent,
DenylistButtonComponent,
PassListComponent,
RefundButtonComponent,
PassRefundComponent,
HistoryListComponent,
StatusLinkComponent,
StatusUpdateComponent,
DenyListComponent,
EarningListComponent,
CardRendererComponent,
ProcessDatetimeComponent,
EarningDateComponent,
GetonDatetimeComponent,
GetoffDatetimeComponent,
StatusComponent,
NgComponent,
DelreqComponent
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
...@@ -38,7 +80,8 @@ import { StaffRegistComponent } from './menu/staff-regist/staff-regist.component ...@@ -38,7 +80,8 @@ import { StaffRegistComponent } from './menu/staff-regist/staff-regist.component
CommonModule, CommonModule,
CdkListbox, CdkListbox,
CdkOption, CdkOption,
ReactiveFormsModule ReactiveFormsModule,
AgGridAngular
], ],
providers: [ providers: [
provideAnimationsAsync() provideAnimationsAsync()
......
src/app/header/header.component.html
View file @ ae65864c
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</td> </td>
@if (mode === 1) { @if (mode === 1) {
<td class="logout" style="text-align: right;"> <td class="logout" style="text-align: right;">
<div (click)="onClickLogout()">ログアウト</div> <div role="button" (click)="onClickLogout()">ログアウト</div>
</td> </td>
} }
</tr> </tr>
......
src/app/header/header.component.ts
View file @ ae65864c
...@@ -11,7 +11,7 @@ import { RouteService } from '../service/route.service'; ...@@ -11,7 +11,7 @@ import { RouteService } from '../service/route.service';
}) })
export class HeaderComponent { export class HeaderComponent {
//モード(0:タイトルのみ、1:ログアウトあり) //モード(0:タイトルのみ、1:ログアウトあり)
@Input() mode: number = 0; @Input() mode = 0;
/** /**
* コンストラクタ * コンストラクタ
......
src/app/menu/master/pass-fare/pass-fare.component.ts
View file @ ae65864c
...@@ -38,7 +38,7 @@ export class PassFareComponent implements OnInit { ...@@ -38,7 +38,7 @@ export class PassFareComponent implements OnInit {
//降車停留所ID //降車停留所ID
getoffStopId?: string; getoffStopId?: string;
//運賃 //運賃
fare: number = 0; fare = 0;
/** /**
* コンストラクタ * コンストラクタ
...@@ -52,7 +52,7 @@ export class PassFareComponent implements OnInit { ...@@ -52,7 +52,7 @@ export class PassFareComponent implements OnInit {
//事業所一覧 //事業所一覧
this.agencyList = new Map(); this.agencyList = new Map();
for (let i = 0; i < 5; i++) { for (let i = 0; i < 5; i++) {
let str = String(i + 1); const str = String(i + 1);
this.agencyList.set(str, "事業所" + str); this.agencyList.set(str, "事業所" + str);
} }
this.agencyId = "1"; this.agencyId = "1";
...@@ -67,7 +67,7 @@ export class PassFareComponent implements OnInit { ...@@ -67,7 +67,7 @@ export class PassFareComponent implements OnInit {
//路線一覧 //路線一覧
this.routeList = new Map(); this.routeList = new Map();
for (let i = 0; i < 5; i++) { for (let i = 0; i < 5; i++) {
let str = String(i + 1); const str = String(i + 1);
this.routeList.set(str, "路線" + str); this.routeList.set(str, "路線" + str);
} }
this.routeId = "1"; this.routeId = "1";
...@@ -82,7 +82,7 @@ export class PassFareComponent implements OnInit { ...@@ -82,7 +82,7 @@ export class PassFareComponent implements OnInit {
//停留所 //停留所
this.stopList = new Map(); this.stopList = new Map();
for (let i = 0; i < 5; i++) { for (let i = 0; i < 5; i++) {
let str = String(i + 1); const str = String(i + 1);
this.stopList.set(str, "停留所" + str); this.stopList.set(str, "停留所" + str);
} }
} }
...@@ -94,13 +94,13 @@ export class PassFareComponent implements OnInit { ...@@ -94,13 +94,13 @@ export class PassFareComponent implements OnInit {
//停留所 //停留所
this.stopList = new Map(); this.stopList = new Map();
for (let i = 0; i < 5; i++) { for (let i = 0; i < 5; i++) {
let str = String(i + 1); const str = String(i + 1);
this.stopList.set(str, "停留所" + str); this.stopList.set(str, "停留所" + str);
} }
this.passFareList = new Array(); this.passFareList = [];
for (let i = 0; i < 10; i++) { for (let i = 0; i < 10; i++) {
let model: PassFareModel = new PassFareModel(); const model: PassFareModel = new PassFareModel();
model.id = String(i + 1); model.id = String(i + 1);
model.agencyId = this.agencyId; model.agencyId = this.agencyId;
model.routeId = this.routeId; model.routeId = this.routeId;
...@@ -131,7 +131,7 @@ export class PassFareComponent implements OnInit { ...@@ -131,7 +131,7 @@ export class PassFareComponent implements OnInit {
* 追加 * 追加
*/ */
onClickAdd(): void { onClickAdd(): void {
let model: PassFareModel = new PassFareModel(); const model: PassFareModel = new PassFareModel();
model.id = String(this.passFareList.length + 1); model.id = String(this.passFareList.length + 1);
model.agencyId = this.agencyId; model.agencyId = this.agencyId;
model.routeId = this.routeId; model.routeId = this.routeId;
...@@ -158,25 +158,25 @@ export class PassFareComponent implements OnInit { ...@@ -158,25 +158,25 @@ export class PassFareComponent implements OnInit {
* 更新 * 更新
*/ */
onClickUpdate(): void { onClickUpdate(): void {
let list = this.formControl.value; const list = this.formControl.value;
if (list !== null) { if (list !== null) {
let model = list[0]; const model = list[0];
for (let i = 0; i < this.passFareList.length; i++) { for (const passFare of this.passFareList) {
if (this.passFareList[i].id === model.id) { if (passFare.id === model.id) {
this.passFareList[i].useTermId = this.useTermId; passFare.useTermId = this.useTermId;
if (typeof this.useTermId !== 'undefined') { if (typeof this.useTermId !== 'undefined') {
this.passFareList[i].useTermName = this.useTermList?.get(this.useTermId); passFare.useTermName = this.useTermList?.get(this.useTermId);
} }
this.passFareList[i].getonStopId = this.getonStopId; passFare.getonStopId = this.getonStopId;
if (typeof this.getonStopId !== 'undefined') { if (typeof this.getonStopId !== 'undefined') {
this.passFareList[i].getonStopName = this.stopList?.get(this.getonStopId); passFare.getonStopName = this.stopList?.get(this.getonStopId);
} }
this.passFareList[i].getoffStopId = this.getoffStopId; passFare.getoffStopId = this.getoffStopId;
if (typeof this.getoffStopId !== 'undefined') { if (typeof this.getoffStopId !== 'undefined') {
this.passFareList[i].getoffStopName = this.stopList?.get(this.getoffStopId); passFare.getoffStopName = this.stopList?.get(this.getoffStopId);
} }
this.passFareList[i].fare = this.fare; passFare.fare = this.fare;
break; break;
} }
} }
...@@ -187,14 +187,14 @@ export class PassFareComponent implements OnInit { ...@@ -187,14 +187,14 @@ export class PassFareComponent implements OnInit {
* 削除 * 削除
*/ */
onClickDel(): void { onClickDel(): void {
let list = this.formControl.value; const list = this.formControl.value;
if (list !== null) { if (list !== null) {
let model = list[0]; const model = list[0];
let newList = new Array(); const newList = [];
for (let i = 0; i < this.passFareList.length; i++) { for (const passFare of this.passFareList) {
if (this.passFareList[i].id !== model.id) { if (passFare.id !== model.id) {
newList.push(this.passFareList[i]); newList.push(passFare);
} }
} }
this.passFareList = newList; this.passFareList = newList;
......
src/app/menu/master/role-mst/role-mst.component.ts
View file @ ae65864c
...@@ -22,17 +22,17 @@ export class RoleMstComponent implements OnInit { ...@@ -22,17 +22,17 @@ export class RoleMstComponent implements OnInit {
//権限名 //権限名
roleName?: string; roleName?: string;
//事業所担当者 //事業所担当者
staffRole: number = 0; staffRole = 0;
//利用者検索 //利用者検索
userRole: number = 0; userRole = 0;
//定期券検索 //定期券検索
passRole: number = 0; passRole = 0;
//乗降履歴 //乗降履歴
historyRole: number = 0; historyRole = 0;
//拒否リスト //拒否リスト
denyListRole: number = 0; denyListRole = 0;
//マスタメンテ //マスタメンテ
masterRole: number = 0; masterRole = 0;
/** /**
* コンストラクタ * コンストラクタ
...@@ -47,7 +47,7 @@ export class RoleMstComponent implements OnInit { ...@@ -47,7 +47,7 @@ export class RoleMstComponent implements OnInit {
* 初期化 * 初期化
*/ */
ngOnInit(): void { ngOnInit(): void {
this.roleList = new Array(); this.roleList = [];
let model: RoleModel = new RoleModel; let model: RoleModel = new RoleModel;
model.roleId = "1"; model.roleId = "1";
model.name = "担当"; model.name = "担当";
...@@ -84,7 +84,7 @@ export class RoleMstComponent implements OnInit { ...@@ -84,7 +84,7 @@ export class RoleMstComponent implements OnInit {
* 追加 * 追加
*/ */
onClickAdd(): void { onClickAdd(): void {
let model: RoleModel = new RoleModel(); const model: RoleModel = new RoleModel();
model.roleId = String(this.roleList.length + 1); model.roleId = String(this.roleList.length + 1);
model.name = this.roleName; model.name = this.roleName;
model.staffRole = this.staffRole; model.staffRole = this.staffRole;
...@@ -100,19 +100,19 @@ export class RoleMstComponent implements OnInit { ...@@ -100,19 +100,19 @@ export class RoleMstComponent implements OnInit {
* 更新 * 更新
*/ */
onClickUpdate(): void { onClickUpdate(): void {
let list = this.formControl.value; const list = this.formControl.value;
if (list !== null) { if (list !== null) {
let model = list[0]; const model = list[0];
for (let i = 0; i < this.roleList.length; i++) { for (const role of this.roleList) {
if (this.roleList[i].roleId === model.roleId) { if (role.roleId === model.roleId) {
this.roleList[i].name = this.roleName; role.name = this.roleName;
this.roleList[i].staffRole = this.staffRole; role.staffRole = this.staffRole;
this.roleList[i].userRole = this.userRole; role.userRole = this.userRole;
this.roleList[i].passRole = this.passRole; role.passRole = this.passRole;
this.roleList[i].historyRole = this.historyRole; role.historyRole = this.historyRole;
this.roleList[i].denyListRole = this.denyListRole; role.denyListRole = this.denyListRole;
this.roleList[i].masterRole = this.masterRole; role.masterRole = this.masterRole;
break; break;
} }
} }
...@@ -123,14 +123,14 @@ export class RoleMstComponent implements OnInit { ...@@ -123,14 +123,14 @@ export class RoleMstComponent implements OnInit {
* 削除 * 削除
*/ */
onClickDel(): void { onClickDel(): void {
let list = this.formControl.value; const list = this.formControl.value;
if (list !== null) { if (list !== null) {
let model = list[0]; const model = list[0];
let newList = new Array(); const newList = [];
for (let i = 0; i < this.roleList.length; i++) { for (const role of this.roleList) {
if (this.roleList[i].roleId !== model.roleId) { if (role.roleId !== model.roleId) {
newList.push(this.roleList[i]); newList.push(role);
} }
} }
this.roleList = newList; this.roleList = newList;
......
src/app/menu/menu.component.html
View file @ ae65864c
...@@ -2,22 +2,33 @@ ...@@ -2,22 +2,33 @@
<div class="container" style="max-width:100%;height:96%;"> <div class="container" style="max-width:100%;height:96%;">
<div class="row h-100"> <div class="row h-100">
<div class="col-md-auto border"> <div class="col-md-auto border">
<div class="common-link" type="button" style="margin-top:20px;" (click)="onClickBusiness()">事業所担当者</div> <div class="common-link" role="button" style="margin-top:20px;" (click)="onClickBusiness()">事業所担当者</div>
<div class="common-link" type="button" style="margin-top:10px;" (click)=" onClickUser()">利用者検索</div> <div class="common-link" role="button" style="margin-top:10px;" (click)="onClickUser()">利用者検索</div>
<div class="common-link" type="button" style="margin-top:10px;" (click)="onClickRoleMst()">権限マスタ</div> <div class="common-link" role="button" style="margin-top:10px;" (click)="onClickEarning()">売上予定一覧</div>
<div class="common-link" type="button" style="margin-top:10px;" (click)="onClickPassFare()">定期券運賃マスタ</div> <div class="common-link" role="button" style="margin-top:10px;" (click)="onClickRoleMst()">権限マスタ</div>
<!-- div class="common-link" type="button" style="margin-top:10px;" (click)="onClickPassFare()">定期券運賃マスタ</div -->
</div> </div>
<div class="col"> <div class="col">
@if (mode === 0) { @if (mode === 1) {
<app-staff-list (clickNew)="onClickNew()" (clickEdit)="onClickEdit($event)"></app-staff-list> <app-staff-list (clickNew)="onClickNew()" (clickEdit)="onClickEdit($event)"></app-staff-list>
} @else if (mode === 1) { } @else if (mode === 11) {
<app-user-list></app-user-list> <app-staff-regist [mode]="staffEditMode" [staffInfoModel]="staffInfoModel"
(clickBack)="onClickRegist()"></app-staff-regist>
} @else if (mode === 2) { } @else if (mode === 2) {
<app-staff-regist [mode]="staffEditMode" (clickBack)="onClickRegist()"></app-staff-regist> <app-user-list (clickPass)="onClickPass($event)" (clickHistory)="onClickHistory($event)"
(clickDenyList)="onClickDenyList($event)"></app-user-list>
} @else if (mode === 21) {
<app-pass-list [model]="userInfoModel"></app-pass-list>
} @else if (mode === 22) {
<app-history-list [model]="userInfoModel"></app-history-list>
} @else if (mode === 23) {
<app-deny-list [model]="userInfoModel"></app-deny-list>
} @else if (mode === 3) { } @else if (mode === 3) {
<app-role-mst></app-role-mst> <app-role-mst></app-role-mst>
} @else if (mode === 4) { } @else if (mode === 4) {
<app-pass-fare></app-pass-fare> <app-pass-fare></app-pass-fare>
} @else if (mode === 5) {
<app-earning-list></app-earning-list>
} }
</div> </div>
</div> </div>
......
src/app/menu/menu.component.ts
View file @ ae65864c
import { FlatTreeControl } from '@angular/cdk/tree';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { StaffInfoModel } from '../model/staff-info.model';
interface ExampleFlatNode { import { PassModel } from '../model/pass.model';
expandable: boolean; import { UserInfoModel } from '../model/user-info.model';
name: string;
level: number;
}
@Component({ @Component({
selector: 'app-menu', selector: 'app-menu',
...@@ -13,23 +9,25 @@ interface ExampleFlatNode { ...@@ -13,23 +9,25 @@ interface ExampleFlatNode {
styleUrl: './menu.component.css' styleUrl: './menu.component.css'
}) })
export class MenuComponent { export class MenuComponent {
//モード(0:事業所担当者、1:利用者検索、2:利用者登録・更新、3:権限マスタ、4:定期券運賃マスタ) //モード(1:事業所担当者、2:利用者検索、21:利用者登録・更新、3:権限マスタ、4:定期券運賃マスタ)
mode: number = 0; mode = 1;
//担当者編集モード(0:登録、1:編集) //担当者編集モード(0:登録、1:編集)
staffEditMode: number = 0; staffEditMode = 0;
//担当者情報
staffInfoModel?: StaffInfoModel;
//利用者情報
userInfoModel?: UserInfoModel;
//定期券情報
passModel?: PassModel;
/** /**
* 事業所担当者 * 事業所担当者
*/ */
onClickBusiness(): void { onClickBusiness(): void {
this.mode = 0;
}
/**
* 利用者検索
*/
onClickUser(): void {
this.mode = 1; this.mode = 1;
} }
...@@ -37,22 +35,59 @@ export class MenuComponent { ...@@ -37,22 +35,59 @@ export class MenuComponent {
* 新規 * 新規
*/ */
onClickNew(): void { onClickNew(): void {
this.mode = 2; this.mode = 11;
this.staffEditMode = 0;
} }
/** /**
* 編集 * 編集
* @param row 行番号 * @param row 行番号
*/ */
onClickEdit(row: number): void { onClickEdit(data: StaffInfoModel): void {
this.mode = 2; this.mode = 11;
this.staffEditMode = 1;
this.staffInfoModel = data;
} }
/** /**
* 担当者登録後 * 担当者登録後
*/ */
onClickRegist(): void { onClickRegist(): void {
this.mode = 0; this.mode = 1;
}
/**
* 利用者検索
*/
onClickUser(): void {
this.mode = 2;
}
/**
* 定期券クリック
* @param model 利用者情報
*/
onClickPass(model: UserInfoModel): void {
this.mode = 21;
this.userInfoModel = model;
}
/**
* 乗車履歴クリック
* @param model 利用者情報
*/
onClickHistory(model: UserInfoModel): void {
this.mode = 22;
this.userInfoModel = model;
}
/**
* 拒否リストクリック
* @param model 利用者情報
*/
onClickDenyList(model: UserInfoModel): void {
this.mode = 23;
this.userInfoModel = model;
} }
/** /**
...@@ -68,4 +103,12 @@ export class MenuComponent { ...@@ -68,4 +103,12 @@ export class MenuComponent {
onClickPassFare(): void { onClickPassFare(): void {
this.mode = 4; this.mode = 4;
} }
/**
* 売上一覧
*/
onClickEarning(): void {
this.mode = 5;
}
} }
src/app/menu/staff-list/staff-list.component.html
View file @ ae65864c
...@@ -25,6 +25,6 @@ ...@@ -25,6 +25,6 @@
</td> </td>
</tr> </tr>
</table> </table>
<jqxGrid style="margin-top:20px;" [width]="770" [selectionmode]="'checkbox'" [source]="source" [theme]="'material'" <ag-grid-angular class="ag-theme-quartz" style="height:500px;margin-top:20px;" [rowData]="staffList"
[autoheight]="true" [pageable]="true" [altrows]="true" [filterable]="true" [sortable]="true" [columns]="columns" [columnDefs]="colDefs" [autoSizeStrategy]="autoSizeStrategy" [context]="context" [rowSelection]="rowSelection"
#grid></jqxGrid> (gridReady)="onGridReady($event)" [pagination]=true></ag-grid-angular>
\ No newline at end of file \ No newline at end of file
src/app/menu/staff-list/staff-list.component.ts
View file @ ae65864c
import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; import { Component, EventEmitter, OnInit, Output } from '@angular/core';
import { StaffInfoModel } from '../../model/staff-info.model'; import { StaffInfoModel } from '../../model/staff-info.model';
import { jqxGridComponent } from 'jqwidgets-ng/jqxgrid'; import { CustomButtonComponent } from './custom-button/custom-button.component';
import { ColDef, GridApi } from 'ag-grid-community';
import { SizeColumnsToFitGridStrategy, SizeColumnsToFitProvidedWidthStrategy, SizeColumnsToContentStrategy } from 'ag-grid-community'
/** /**
* 事業所担当者一覧 * 事業所担当者一覧
...@@ -11,44 +13,53 @@ import { jqxGridComponent } from 'jqwidgets-ng/jqxgrid'; ...@@ -11,44 +13,53 @@ import { jqxGridComponent } from 'jqwidgets-ng/jqxgrid';
styleUrl: './staff-list.component.css' styleUrl: './staff-list.component.css'
}) })
export class StaffListComponent implements OnInit { export class StaffListComponent implements OnInit {
@Output() clickNew: EventEmitter<void> = new EventEmitter(); @Output() clickNew: EventEmitter<void> = new EventEmitter<void>();
@Output() clickEdit: EventEmitter<number> = new EventEmitter(); @Output() clickEdit: EventEmitter<StaffInfoModel> = new EventEmitter<StaffInfoModel>();
@ViewChild('grid', { static: false }) myGrid?: jqxGridComponent;
//事業所ID //事業所ID
agencyId: string = ""; agencyId = "";
//事業所一覧 //事業所一覧
agencyList: Map<string, string> = new Map(); agencyList = new Map<string, string>();
//担当者一覧 //担当者一覧
staffList: StaffInfoModel[] = []; staffList: StaffInfoModel[] = [];
context: any;
private gridApi!: GridApi<StaffInfoModel>;
rowSelection: "single" | "multiple" = "multiple";
source: any = { colDefs: ColDef[] = [
datatype: 'json', { headerName: '', field: "update", width: 40, cellRenderer: CustomButtonComponent, checkboxSelection: true, headerCheckboxSelection: true },
datafields: [ { headerName: 'メールアドレス', field: "email", width: 190 },
{ name: 'update', type: 'string' }, { headerName: '氏名', field: "name", width: 160 },
{ name: 'email', type: 'string' }, { headerName: '会社', field: "company", width: 160 },
{ name: 'name', type: 'string' }, { headerName: '部署', field: "department", width: 160 },
{ name: 'company', type: 'string' }, { headerName: '権限', field: "roleName", width: 140 },
{ name: 'department', type: 'string' }, { field: "agencyId", hide: true },
{ name: 'roleName', type: 'string' } { field: "password", hide: true },
] { field: "roleId", hide: true }
}
columns = [
{
text: '', datafield: 'update', width: 40, cellsrenderer: function (row: any, column: any, value: any) {
return '<input type="button" style="width:40px;height:100%;" data-row="' + row + '" onclick="onClickEdit(' + row + ')" value="編集">';
}
},
{ text: 'メールアドレス', datafield: 'email', width: 200, },
{ text: '氏名', datafield: 'name', width: 200 },
{ text: '会社', datafield: 'company', width: 100 },
{ text: '部署', datafield: 'department', width: 100 },
{ text: '権限', datafield: 'roleName', width: 100 }
]; ];
public autoSizeStrategy:
| SizeColumnsToFitGridStrategy
| SizeColumnsToFitProvidedWidthStrategy
| SizeColumnsToContentStrategy = {
type: "fitGridWidth",
defaultMinWidth: 100,
columnLimits: [
{
colId: "country",
minWidth: 900,
},
],
};
/** /**
* コンストラクタ * コンストラクタ
*/ */
constructor() { } constructor() {
this.context = {
componentParent: this
}
}
/** /**
* 初期処理 * 初期処理
...@@ -56,7 +67,7 @@ export class StaffListComponent implements OnInit { ...@@ -56,7 +67,7 @@ export class StaffListComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
this.agencyList = new Map(); this.agencyList = new Map();
for (let i = 0; i < 5; i++) { for (let i = 0; i < 5; i++) {
let str = String(i + 1); const str = String(i + 1);
this.agencyList.set("000" + str, "事業所" + str); this.agencyList.set("000" + str, "事業所" + str);
if (i == 0) { if (i == 0) {
this.agencyId = "000" + str; this.agencyId = "000" + str;
...@@ -69,20 +80,19 @@ export class StaffListComponent implements OnInit { ...@@ -69,20 +80,19 @@ export class StaffListComponent implements OnInit {
*/ */
onClickSearch(): void { onClickSearch(): void {
//担当者一覧取得 //担当者一覧取得
this.staffList = new Array(); this.staffList = [];
for (let i = 0; i < 5; i++) { for (let i = 0; i < 5; i++) {
let model = new StaffInfoModel(); const model = new StaffInfoModel();
model.agencyId = String(i + 1);
model.email = "test" + String(i + 1) + "@test.com"; model.email = "test" + String(i + 1) + "@test.com";
model.name = "山田 太郎"; model.name = "山田 太郎";
model.password = "00000000";
model.company = "テスト会社"; model.company = "テスト会社";
model.department = "テスト部"; model.department = "テスト部";
model.roleId = "0"; model.roleId = "1";
model.roleName = "システム管理者"; model.roleName = "システム管理者";
this.staffList.push(model); this.staffList.push(model);
} }
this.source.localdata = JSON.stringify(this.staffList);
this.myGrid?.updatebounddata();
} }
/** /**
...@@ -95,20 +105,34 @@ export class StaffListComponent implements OnInit { ...@@ -95,20 +105,34 @@ export class StaffListComponent implements OnInit {
/** /**
* 編集 * 編集
*/ */
onClickEdit(row: number): void { onClickEdit(data: StaffInfoModel): void {
this.clickEdit.emit(row); this.clickEdit.emit(data);
} }
/** /**
* 削除 * 削除
*/ */
onClickDel(): void { onClickDel(): void {
//TODO const list: StaffInfoModel[] = this.gridApi.getSelectedRows();
if (typeof this.myGrid !== "undefined") { const array = [];
let rows = this.myGrid.getselectedrowindexes(); for (const staff of this.staffList) {
for (let i = 0; i < rows.length; i++) { let del = false;
console.log(rows[i]); for (const model of list) {
if (model.email === staff.email) {
del = true;
break;
}
}
if (!del) {
array.push(staff);
} }
} }
this.staffList = array;
this.gridApi.setGridOption("rowData", this.staffList);
}
onGridReady(params: any): void {
this.gridApi = params.api;
} }
} }
src/app/menu/staff-regist/staff-regist.component.ts
View file @ ae65864c
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { StaffInfoModel } from '../../model/staff-info.model';
@Component({ @Component({
selector: 'app-staff-regist', selector: 'app-staff-regist',
...@@ -6,8 +7,10 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; ...@@ -6,8 +7,10 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
styleUrl: './staff-regist.component.css' styleUrl: './staff-regist.component.css'
}) })
export class StaffRegistComponent implements OnInit { export class StaffRegistComponent implements OnInit {
@Input() mode: number = 0; @Input() mode = 0;
@Output() clickBack: EventEmitter<void> = new EventEmitter(); @Input() staffInfoModel?: StaffInfoModel;
@Output() clickBack: EventEmitter<void> = new EventEmitter<void>();
//事業所ID //事業所ID
agencyId?: string; agencyId?: string;
//事業所一覧 //事業所一覧
...@@ -37,15 +40,24 @@ export class StaffRegistComponent implements OnInit { ...@@ -37,15 +40,24 @@ export class StaffRegistComponent implements OnInit {
//事業所一覧 //事業所一覧
this.agencyList = new Map(); this.agencyList = new Map();
for (let i = 0; i < 5; i++) { for (let i = 0; i < 5; i++) {
let str = String(i + 1); const str = String(i + 1);
this.agencyList?.set(str, "事業所" + str) this.agencyList?.set(str, "事業所" + str)
} }
//権限一覧 //権限一覧
this.roleList = new Map(); this.roleList = new Map();
for (let i = 0; i < 3; i++) { for (let i = 0; i < 3; i++) {
let str = String(i + 1); const str = String(i + 1);
this.roleList?.set(str, "権限" + str) this.roleList?.set(str, "権限" + str)
} }
if (this.staffInfoModel !== null) {
this.agencyId = this.staffInfoModel?.agencyId;
this.email = this.staffInfoModel?.email;
this.password = this.staffInfoModel?.password;
this.name = this.staffInfoModel?.name;
this.department = this.staffInfoModel?.department;
this.roleId = this.staffInfoModel?.roleId;
}
} }
/** /**
......
src/app/menu/user-list/user-list.component.html
View file @ ae65864c
...@@ -11,5 +11,6 @@ ...@@ -11,5 +11,6 @@
</td> </td>
</tr> </tr>
</table> </table>
<jqxGrid style="margin-top:20px;" [width]="940" [source]="source" [theme]="'material'" [autoheight]="true" <ag-grid-angular class="ag-theme-quartz" style="height:500px;margin-top:20px;" [rowData]="userList"
[pageable]="true" [altrows]="true" [filterable]="true" [sortable]="true" [columns]="columns" #grid></jqxGrid> [columnDefs]="colDefs" [autoSizeStrategy]="autoSizeStrategy" [context]="context" (gridReady)="onGridReady($event)"
\ No newline at end of file [pagination]=true></ag-grid-angular>
\ No newline at end of file
src/app/menu/user-list/user-list.component.ts
View file @ ae65864c
import { Component, ViewChild } from '@angular/core'; import { Component, EventEmitter, Output } from '@angular/core';
import { UserInfoModel } from '../../model/user-info.model'; import { UserInfoModel } from '../../model/user-info.model';
import { jqxGridComponent } from 'jqwidgets-ng/jqxgrid'; import { ColDef, GridApi } from 'ag-grid-community';
import { HistoryButtonComponent } from './history-button/history-button.component';
import { DenylistButtonComponent } from './denylist-button/denylist-button.component';
import { SizeColumnsToFitGridStrategy, SizeColumnsToFitProvidedWidthStrategy, SizeColumnsToContentStrategy } from 'ag-grid-community'
import { PassRefundService } from '../../service/pass-refund.service';
/** /**
* 利用者検索画面 * 利用者検索画面
...@@ -11,67 +15,91 @@ import { jqxGridComponent } from 'jqwidgets-ng/jqxgrid'; ...@@ -11,67 +15,91 @@ import { jqxGridComponent } from 'jqwidgets-ng/jqxgrid';
styleUrl: './user-list.component.css' styleUrl: './user-list.component.css'
}) })
export class UserListComponent { export class UserListComponent {
@ViewChild('grid', { static: false }) myGrid?: jqxGridComponent; @Output() clickPass: EventEmitter<UserInfoModel> = new EventEmitter<UserInfoModel>();
@Output() clickHistory: EventEmitter<UserInfoModel> = new EventEmitter<UserInfoModel>();
@Output() clickDenyList: EventEmitter<UserInfoModel> = new EventEmitter<UserInfoModel>();
//利用者名 //利用者名
userName?: string; userName?: string;
//利用者一覧 //利用者一覧
userList: UserInfoModel[] = []; userList: UserInfoModel[] = [];
context: any;
private gridApi!: GridApi<UserInfoModel>;
source: any = { colDefs: ColDef[] = [
datatype: 'json', { headerName: '氏名', field: "name", width: 200 },
datafields: [ { headerName: 'フリガナ', field: "nameKana", width: 200 },
{ name: 'name', type: 'string' }, { headerName: 'メールアドレス', field: "email", width: 200 },
{ name: 'nameKana', type: 'string' }, { headerName: '電話番号', field: "phoneNumber", width: 200 },
{ name: 'email', type: 'string' }, //{ headerName: '', field: "pass", width: 80, cellRenderer: PassButtonComponent },
{ name: 'phoneNumber', type: 'string' }, { headerName: '', field: "history", width: 80, cellRenderer: HistoryButtonComponent },
{ name: 'pass', type: 'string' }, { headerName: '', field: "denyList", width: 80, cellRenderer: DenylistButtonComponent },
{ name: 'history', type: 'string' },
{ name: 'denyList', type: 'string' }
]
}
columns = [
{ text: '氏名', datafield: 'name', width: 200, },
{ text: 'フリガナ', datafield: 'nameKana', width: 200 },
{ text: 'メールアドレス', datafield: 'email', width: 200 },
{ text: '電話番号', datafield: 'phoneNumber', width: 100 },
{
text: '', datafield: 'pass', width: 80, cellsrenderer: function (row: any, column: any, value: any) {
return '<input type="button" style="width:80px;height:100%;" data-row="' + row + '" onclick="onClickPass(' + row + ')" value="定期券">';
}
},
{
text: '', datafield: 'history', width: 80, cellsrenderer: function (row: any, column: any, value: any) {
return '<input type="button" style="width:80px;height:100%;" data-row="' + row + '" onclick="onClickHistory(' + row + ')" value="乗降履歴">';
}
},
{
text: '', datafield: 'denyList', width: 80, cellsrenderer: function (row: any, column: any, value: any) {
return '<input type="button" style="width:80px;height:100%;" data-row="' + row + '" onclick="onClickHistory(' + row + ')" value="拒否リスト">';
}
}
]; ];
public autoSizeStrategy:
| SizeColumnsToFitGridStrategy
| SizeColumnsToFitProvidedWidthStrategy
| SizeColumnsToContentStrategy = {
type: "fitGridWidth",
defaultMinWidth: 100,
columnLimits: [
{
colId: "country",
minWidth: 900,
},
],
};
/** /**
* コンストラクタ * コンストラクタ
*/ */
constructor() { } constructor(private passRefundService: PassRefundService) {
this.context = {
componentParent: this
}
}
/** /**
* 検索 * 検索
*/ */
onClickSearch(): void { onClickSearch(): void {
this.userList = new Array(); this.userList = [];
for (let i = 0; i < 10; i++) { for (let i = 0; i < 10; i++) {
let str = String(i + 1); const str = String(i + 1);
let model = new UserInfoModel(); const model = new UserInfoModel();
model.name = "山田太郎" + str; model.name = "山田太郎" + str;
model.nameKana = "ヤマダタロウ" + str; model.nameKana = "ヤマダタロウ" + str;
model.email = "tarou_yamada" + str + "@test.com"; model.email = "tarou_yamada" + str + "@test.com";
model.phoneNumber = "09088882456"; model.phoneNumber = "09088882456";
this.userList.push(model); this.userList.push(model);
} }
}
this.source.localdata = JSON.stringify(this.userList); onGridReady(params: any): void {
this.myGrid?.updatebounddata(); this.gridApi = params.api;
}
/**
* 定期券クリック
* @param model 利用者情報
*/
onClickPass(model: UserInfoModel): void {
this.clickPass.emit(model);
}
/**
* 乗車履歴クリック
* @param model 利用者情報
*/
onClickHistory(model: UserInfoModel): void {
this.clickHistory.emit(model);
}
/**
* 拒否リストクリック
* @param model 利用者情報
*/
onClickDenyList(model: UserInfoModel): void {
this.clickDenyList.emit(model);
} }
} }
src/app/model/pass-fare.model.ts
View file @ ae65864c
...@@ -23,5 +23,5 @@ export class PassFareModel { ...@@ -23,5 +23,5 @@ export class PassFareModel {
//降車停留所名 //降車停留所名
getoffStopName?: string; getoffStopName?: string;
//運賃 //運賃
fare: number = 0; fare = 0;
} }
\ No newline at end of file
src/app/model/role.model.ts
View file @ ae65864c
...@@ -3,19 +3,19 @@ ...@@ -3,19 +3,19 @@
*/ */
export class RoleModel { export class RoleModel {
//権限ID //権限ID
roleId: string = ""; roleId = "";
//権限名 //権限名
name?: string; name?: string;
//担当者管理(0:閲覧不可、1:自事業所のみ、2:全事業所) //担当者管理(0:閲覧不可、1:自事業所のみ、2:全事業所)
staffRole: number = 0; staffRole = 0;
//利用者検索(0:閲覧不可、1:自事業所のみ、2:全事業所) //利用者検索(0:閲覧不可、1:自事業所のみ、2:全事業所)
userRole: number = 0; userRole = 0;
//定期券検索(0:閲覧不可、1:自事業所のみ、2:全事業所) //定期券検索(0:閲覧不可、1:自事業所のみ、2:全事業所)
passRole: number = 0; passRole = 0;
//乗降履歴(0:閲覧不可、1:自事業所のみ、2:全事業所) //乗降履歴(0:閲覧不可、1:自事業所のみ、2:全事業所)
historyRole: number = 0; historyRole = 0;
//拒否リスト(0:閲覧不可、1:自事業所のみ、2:全事業所) //拒否リスト(0:閲覧不可、1:自事業所のみ、2:全事業所)
denyListRole: number = 0; denyListRole = 0;
//マスタメンテ(0:不可、1:可) //マスタメンテ(0:不可、1:可)
masterRole: number = 0; masterRole = 0;
} }
\ No newline at end of file
src/app/model/staff-info.model.ts
View file @ ae65864c
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
*/ */
export class StaffInfoModel { export class StaffInfoModel {
//選択状態 //選択状態
select: boolean = false; select = false;
//メールアドレス //メールアドレス
email?: string; email?: string;
//パスワード
password?: string;
//スタッフ氏名 //スタッフ氏名
name?: string; name?: string;
//会社名 //会社名
...@@ -16,4 +18,6 @@ export class StaffInfoModel { ...@@ -16,4 +18,6 @@ export class StaffInfoModel {
roleId?: string; roleId?: string;
//権限名 //権限名
roleName?: string; roleName?: string;
//事業所ID
agencyId?: string;
} }
\ No newline at end of file
src/styles.css
View file @ ae65864c
/* You can add global styles to this file, and also import other style files */ /* You can add global styles to this file, and also import other style files */
/* Core Grid CSS */
@import "ag-grid-community/styles/ag-grid.css";
/* Quartz Theme Specific CSS */
@import "ag-grid-community/styles/ag-theme-quartz.css";
.common-button { .common-button {
background-color: #f19024; background-color: #f19024;
color: white; color: white;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment