Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollostudycenter

src/app/app.routing.ts

@@ -55,7 +55,10 @@ export const routes: Routes = [
       {
         path: 'enrolment',
         loadChildren: './views/enrolment/enrolment.module#EnrolmentModule'
-      }
+      },
+      {
+        path: 'paymentdetails',
+        loadChildren: './views/payment-details/payment-details.module#PaymentDetailsModule',      },
     ]
   },
   {

src/app/components/app-sidebar/app-sidebar.component.html

@@ -83,7 +83,7 @@
         <a class="nav-link" routerLinkActive="active" [routerLink]="['/enrolment']"><i class="fa fa-graduation-cap"></i> Student Enrolment</a>
       </li>
       <li class="nav-item">
-        <a class="nav-link" routerLinkActive="active" [routerLink]="['/shareallotment']"><i class="icon-pie-chart"></i> Allocate Fees</a>
+        <a class="nav-link" routerLinkActive="active" [routerLink]="['/shareallotment']"><i class="icon-pie-chart"></i> Fees Share</a>
       </li>
       <li class="nav-item">
         <a class="nav-link" routerLinkActive="active" [routerLink]="['/feescalculator']"><i class="icon-calculator"></i> Fees Calculator</a>
@@ -105,6 +105,9 @@
           </li>
         </ul>
       </li> 
+      <li class="nav-item">
+        <a class="nav-link" routerLinkActive="active" [routerLink]="['/paymentdetails/accountstatement']"><i class="fa fa-credit-card-alt"></i> Account Statement</a>
+      </li>
     </ul>
   </nav>
 </div>

src/app/containers/full-layout/full-layout.component.html

@@ -7,13 +7,13 @@
     <ol class="breadcrumb">
       <app-breadcrumbs></app-breadcrumbs>
       <!-- Breadcrumb Menu-->
-      <li class="breadcrumb-menu d-md-down-none">
+      <!-- <li class="breadcrumb-menu d-md-down-none">
         <div class="btn-group" role="group" aria-label="Button group with nested dropdown">
           <a class="btn" href="#"><i class="icon-speech"></i></a>
           <a class="btn" [routerLink]="['/dashboard']"><i class="icon-graph"></i> &nbsp;Dashboard</a>
           <a class="btn" href="#"><i class="icon-settings"></i> &nbsp;Settings</a>
         </div>
-      </li>
+      </li> -->
     </ol>
     <div class="container-fluid">
       <router-outlet></router-outlet>

src/app/views/payment-details/account-statement/account-statement.component.html

@@ -0,0 +1,171 @@
+<span *ngIf="show" class="backToList">
+
+  <a (click)="show = !show;" tooltip="Go to listing">Back to List</a>
+  
+  </span>
+<div class="col-lg-12" *ngIf="!show">
+
+<!--/.row-->
+<div class="row">
+<!--/.col-->
+<div class="col-md-12 mb-4">
+<!-- Nav tabs -->
+  <div class="card">
+      <div class="card-header">
+        <i class="fa fa-align-justify"></i> View Account Statement Details
+    </div>
+  <div class="card-body">
+    <div class="row">
+                      <div class="col-md-3">
+                          <div class="input-prepend input-group">
+                              <select id="disabledSelect" class="form-control">
+                                  <option value="0">From Date</option>
+                                 
+                              </select>
+                          </div>
+                      </div>
+                      <div class="col-md-3">
+                          <div class="input-prepend input-group">
+                              <select id="disabledSelect" class="form-control">
+                                  <option value="0">To Date</option>
+                                  
+                              </select>
+                          </div>
+                      </div>
+                       <div class="col-md-3">
+                          <div class="input-prepend input-group">
+                              <select id="disabledSelect" class="form-control">
+                                  <option value="0">University</option>
+                                 
+                              </select>
+                          </div>
+                      </div>
+<!-- 
+                      <div class="col-md-2">
+                          <div class="input-prepend input-group">
+                              <select id="disabledSelect" class="form-control">
+                                  <option value="0">Amount</option>
+                                 
+                              </select>
+                          </div>
+                      </div> -->
+                      <div class="col-md-3">
+                          <div class="input-prepend input-group">
+                              <button type="button" value="Submit" class="btn btn-primary"> <i class="fa fa-search"></i> Search</button>
+                          </div>
+                      </div>
+                  </div>
+                  <br>
+                    <div class="row">
+                      <div class="col-md-3">
+                          <div class="input-prepend input-group">
+                              <span class="input-group-addon">
+                                  <i class="fa fa-search"></i>
+                                  </span>
+                              <input id="search" class="form-control" type="text" placeholder="search">
+                          </div>
+                      </div>
+                  </div>
+      <br>
+        <div class="row">
+  <div class="col-lg-12 col-xs-12">
+    <table class="table table-bordered">
+  
+      <thead>
+        <tr>
+         
+      <th>Date</th>
+          <th>Description</th>
+          <th>University</th>
+          <th>Form</th>
+    <th>Debit</th>
+    <th>Credit</th>
+    <th>Balance</th>
+          <th>Remarks</th>
+    
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+           
+    <td>10/08/2018</td>
+        <td>Payment Received</td>
+        <td>Anna Uni</td>
+           <td><a href="page-link" href="#">FormID 1</a></td>
+    <td>0</td>
+    <td>10,000</td>
+    <td>10,000</td>
+          <td>Amount Received by studycenter A</td>
+     
+     
+        
+          
+        </tr>
+        <tr>
+           
+     <td>11/08/2018</td>
+          <td>Fees Adjust</td>
+        <td>Anna Uni</td>
+           <td><a href="page-link" href="#">FormID 2</a></td>
+    <td>0</td>
+    <td>15,000</td>
+    <td>25,000</td>
+           <td>Amount Adjust studycenter A</td>
+     
+          
+    
+          
+        </tr>
+        <tr>
+            
+     <td>12/08/2018</td>
+          <td>Refund</td>
+        <td>Anna Uni</td>
+          <td><a href="page-link" href="#">FormID 3</a></td>
+    <td>5000</td>
+    <td>0</td>
+    <td>20,000</td>
+     <td>Amount Refund</td>
+     
+         
+                                
+        </tr>
+       
+       
+      </tbody>
+    </table>
+    <ul class="pagination">
+      <li class="page-item"><a class="page-link" href="#">Prev</a></li>
+      <li class="page-item active">
+        <a class="page-link" href="#">1</a>
+      </li>
+      <li class="page-item"><a class="page-link" href="#">2</a></li>
+      <li class="page-item"><a class="page-link" href="#">3</a></li>
+      <li class="page-item"><a class="page-link" href="#">4</a></li>
+      <li class="page-item"><a class="page-link" href="#">Next</a></li>
+    </ul>
+  </div>
+  <!--/.col-->
+</div>
+    </div>
+    <br>
+      <!-- <div class="card-footer">
+        <div class="form-group row">
+          <div class=" col-md-12" align="right">
+    
+              <button type="button" class="btn btn-sm btn-success"><i class="fa fa-dot-circle-o"></i> Submit</button>
+      &nbsp;
+              <button type="reset" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
+          </div>
+        </div>
+      </div> -->		  
+      
+   
+</div>
+
+</div><!--/.col-->
+</div>
+</div>
+
+<!--/.row-->
+

src/app/views/payment-details/account-statement/account-statement.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AccountStatementComponent } from './account-statement.component';
+
+describe('AccountStatementComponent', () => {
+  let component: AccountStatementComponent;
+  let fixture: ComponentFixture<AccountStatementComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ AccountStatementComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AccountStatementComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/views/payment-details/account-statement/account-statement.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-account-statement',
+  templateUrl: './account-statement.component.html',
+  styleUrls: ['./account-statement.component.scss']
+})
+export class AccountStatementComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+  }
+
+}

src/app/views/payment-details/payment-details-routing.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { AccountStatementComponent } from './account-statement/account-statement.component';
+
+const routes: Routes = [
+  {
+    path: 'accountstatement',
+    component: AccountStatementComponent,
+    data: {
+      title: 'Account Statement'
+    }
+  }
+  
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class PaymentDetailsRoutingModule { }

src/app/views/payment-details/payment-details.module.spec.ts

@@ -0,0 +1,13 @@
+import { PaymentDetailsModule } from './payment-details.module';
+
+describe('PaymentDetailsModule', () => {
+  let paymentDetailsModule: PaymentDetailsModule;
+
+  beforeEach(() => {
+    paymentDetailsModule = new PaymentDetailsModule();
+  });
+
+  it('should create an instance', () => {
+    expect(paymentDetailsModule).toBeTruthy();
+  });
+});

src/app/views/payment-details/payment-details.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+// Tabs Component
+import { TabsModule } from 'ngx-bootstrap/tabs';
+import { TooltipModule } from 'ngx-bootstrap/tooltip';
+import { ModalModule } from 'ngx-bootstrap/modal';
+import { PaymentDetailsRoutingModule } from './payment-details-routing.module';
+import { AccountStatementComponent } from './account-statement/account-statement.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    PaymentDetailsRoutingModule, TabsModule,
+    ModalModule.forRoot(),
+    TooltipModule,
+  ],
+  declarations: [AccountStatementComponent]
+})
+export class PaymentDetailsModule { }