merging code

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Nitesh Yadav
2026-04-20 14:26:25 +05:30
co-authored by Claude Sonnet 4.6
322 changed files with 28779 additions and 4976 deletions
@@ -85,7 +85,14 @@
<button type="button" mat-stroked-button [routerLink]="['../']" class="co-actions__cancel">
{{ 'labels.buttons.Cancel' | translate }}
</button>
<button type="submit" mat-flat-button color="primary" [disabled]="!officeForm.valid" class="co-actions__submit" *mifosxHasPermission="'CREATE_OFFICE'">
<button
type="submit"
mat-flat-button
color="primary"
[disabled]="!officeForm.valid"
class="co-actions__submit"
*mifosxHasPermission="'CREATE_OFFICE'"
>
<i class="fas fa-check"></i> {{ 'labels.buttons.Submit' | translate }}
</button>
</div>
@@ -44,9 +44,14 @@ $gray-900: #202124;
border-color: $border !important;
color: $gray-500 !important;
i { margin-right: 6px; }
i {
margin-right: 6px;
}
&:hover { color: $primary !important; border-color: $primary !important; }
&:hover {
color: $primary !important;
border-color: $primary !important;
}
}
// Card
@@ -92,7 +97,9 @@ $gray-900: #202124;
gap: 4px 16px;
padding: 16px 24px;
@media (max-width: 600px) { grid-template-columns: 1fr; }
@media (width <= 600px) {
grid-template-columns: 1fr;
}
}
.co-field {
@@ -128,6 +135,9 @@ $gray-900: #202124;
height: 36px !important;
box-shadow: 0 1px 3px rgba($primary, 0.3) !important;
i { margin-right: 6px; font-size: 12px; }
i {
margin-right: 6px;
font-size: 12px;
}
}
}
@@ -87,7 +87,14 @@
<button type="button" mat-stroked-button [routerLink]="['../general']" class="eo-actions__cancel">
{{ 'labels.buttons.Cancel' | translate }}
</button>
<button type="submit" mat-flat-button color="primary" [disabled]="!officeForm.valid" class="eo-actions__submit" *mifosxHasPermission="'UPDATE_OFFICE'">
<button
type="submit"
mat-flat-button
color="primary"
[disabled]="!officeForm.valid"
class="eo-actions__submit"
*mifosxHasPermission="'UPDATE_OFFICE'"
>
<i class="fas fa-check"></i> {{ 'labels.buttons.Submit' | translate }}
</button>
</div>
@@ -44,9 +44,14 @@ $gray-900: #202124;
border-color: $border !important;
color: $gray-500 !important;
i { margin-right: 6px; }
i {
margin-right: 6px;
}
&:hover { color: $primary !important; border-color: $primary !important; }
&:hover {
color: $primary !important;
border-color: $primary !important;
}
}
// Card
@@ -92,7 +97,9 @@ $gray-900: #202124;
gap: 4px 16px;
padding: 16px 24px;
@media (max-width: 600px) { grid-template-columns: 1fr; }
@media (width <= 600px) {
grid-template-columns: 1fr;
}
}
.eo-field {
@@ -128,6 +135,9 @@ $gray-900: #202124;
height: 36px !important;
box-shadow: 0 1px 3px rgba($primary, 0.3) !important;
i { margin-right: 6px; font-size: 12px; }
i {
margin-right: 6px;
font-size: 12px;
}
}
}
@@ -32,13 +32,24 @@
</mat-button-toggle-group>
<div class="table-buttons">
<div #buttonImportOffices>
<button mat-stroked-button class="btn-import" *mifosxHasPermission="'CREATE_OFFICE'" [routerLink]="['/organization', 'bulk-import', 'Offices']">
<button
mat-stroked-button
class="btn-import"
*mifosxHasPermission="'CREATE_OFFICE'"
[routerLink]="['/organization', 'bulk-import', 'Offices']"
>
<fa-icon icon="upload" class="m-r-10"></fa-icon>
{{ 'labels.buttons.Import Offices' | translate }}
</button>
</div>
<div #buttonCreateOffice>
<button mat-flat-button color="primary" class="btn-create" [routerLink]="['create']" *mifosxHasPermission="'CREATE_OFFICE'">
<button
mat-flat-button
color="primary"
class="btn-create"
[routerLink]="['create']"
*mifosxHasPermission="'CREATE_OFFICE'"
>
<fa-icon icon="plus" class="m-r-10"></fa-icon>
{{ 'labels.buttons.Create Office' | translate }}
</button>
@@ -72,7 +83,12 @@
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns" class="table-row" [routerLink]="[row.id, 'general']"></tr>
<tr
mat-row
*matRowDef="let row; columns: displayedColumns"
class="table-row"
[routerLink]="[row.id, 'general']"
></tr>
</table>
<mat-paginator [pageSizeOptions]="[10, 25, 50, 100]" showFirstLastButtons></mat-paginator>
</div>
@@ -15,7 +15,9 @@
<div class="gt-cell">
<div class="gt-cell__label">{{ 'labels.inputs.Opened On' | translate }}</div>
<div class="gt-cell__value">{{ officeData.openingDate ? (officeData.openingDate | dateFormat) : 'Unassigned' }}</div>
<div class="gt-cell__value">
{{ officeData.openingDate ? (officeData.openingDate | dateFormat) : 'Unassigned' }}
</div>
</div>
<div class="gt-cell">
@@ -25,14 +25,16 @@ $gray-900: #202124;
grid-template-columns: repeat(2, 1fr);
gap: 10px;
@media (max-width: 600px) { grid-template-columns: 1fr; }
@media (width <= 600px) {
grid-template-columns: 1fr;
}
}
.gt-cell {
padding: 14px 16px;
background: $gray-50;
border-radius: 8px;
border: 1px solid rgba(0, 0, 0, 0.04);
border: 1px solid rgb(0 0 0 / 4%);
transition: background 0.12s;
&:hover {
@@ -15,7 +15,13 @@
</button>
<h2 class="vo-header__title">{{ 'labels.heading.Office Details' | translate }}</h2>
</div>
<button mat-flat-button color="primary" [routerLink]="['./edit']" class="vo-edit-btn" *mifosxHasPermission="'UPDATE_OFFICE'">
<button
mat-flat-button
color="primary"
[routerLink]="['./edit']"
class="vo-edit-btn"
*mifosxHasPermission="'UPDATE_OFFICE'"
>
<fa-icon icon="edit" class="m-r-10"></fa-icon>
{{ 'labels.buttons.Edit' | translate }}
</button>
@@ -52,9 +52,14 @@ $gray-900: #202124;
border-color: $border !important;
color: $gray-500 !important;
i { margin-right: 6px; }
i {
margin-right: 6px;
}
&:hover { color: $primary !important; border-color: $primary !important; }
&:hover {
color: $primary !important;
border-color: $primary !important;
}
}
.vo-edit-btn {
@@ -92,7 +97,7 @@ $gray-900: #202124;
}
// Responsive
@media (max-width: 600px) {
@media (width <= 600px) {
.vo-header {
flex-direction: column;
align-items: flex-start;