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

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

@@ -90,17 +90,17 @@ export class AppSidebar {
           name: 'Fees',
           url: '/masters/FeesMaster',
           icon: 'fa fa-money'
-        },
-		{
-          name: 'Document',
-          url: '/masters/DocumentMaster',
-          icon: 'fa fa-file'
-        },
-		{
-          name: 'Exam Timetable',
-          url: '/masters/ExamTimetable',
-          icon: 'fa fa-calendar-minus-o'
         }
+		// {
+    //       name: 'Document',
+    //       url: '/masters/DocumentMaster',
+    //       icon: 'fa fa-file'
+    //     },
+		// {
+    //       name: 'Exam Timetable',
+    //       url: '/masters/ExamTimetable',
+    //       icon: 'fa fa-calendar-minus-o'
+    //     }
       ]
     },{
       name: 'Student Enrolment',

src/app/views/masters/fees-master/fees-master.component.html

@@ -111,43 +111,37 @@
          <i class="fa fa-align-justify"></i>Fees
         </div>
      
-        <form>
+        <form #signupForm="ngForm" (ngSubmit)="onSubmit()"  #f="ngForm" novalidate>
 		 <div class="card-body">
           <div class="form-group row">
 		 
             <div class=" col-md-4 ">
               <label for="company">Fees Name<span class="required">&nbsp;*</span></label>
-              <input type="text" class="form-control" id="Fees"  placeholder="Enter Fees Name">         
+              <input type="text" class="form-control" name="feesName" id="feesName"  [(ngModel)]="model.feesName"  placeholder="Enter Fees Name">         
 			  </div>
              <div class=" col-md-4 ">
               <label for="company">Fees Description<span class="required">&nbsp;*</span></label>
-              <input type="text" class="form-control" id="Feesdes" placeholder="Fees description">         
+              <input type="text" class="form-control" name="Feesdes" id="Feesdes"  [(ngModel)]="model.Feesdes" placeholder="Fees description">         
 			  </div>
          <div class="col-md-4">
 			            <label for="company">Active/De-Active<span class="required">&nbsp;*</span></label>
 			            <br>
 						  <label class="switch switch-3d switch-primary">
-						  <input type="checkbox" class="switch-input" checked>
+						  <input type="checkbox" name="active" id="active" [(ngModel)]="model.active" class="switch-input" checked>
 						  <span class="switch-label"></span>
 						  <span class="switch-handle"></span>
 					     </label>
-		            </div>
+		        </div>
 			  </div>
-      <!-- <div class="form-group row">
+     
-         <p>hai</p>
+          
-          <p>{{msg}}</p>
-          <div class=" col-md-4 ">
-              <label for="company">Fees Name<span class="required">&nbsp;*</span></label>
-              <input type="text"  class="form-control" id="fees"  placeholder="Enter Document Name">         
-			  </div>
-          </div>-->
 		  </div>
 		  <br>
           <div class="card-footer">
           <div class="form-group row">
             <div class=" col-md-12" align="right">
-			
+			                
-                <button (click)="onSubmit()" style="margin-bottom: -14px" class="btn btn-sm btn-success" ><i class="fa fa-dot-circle-o" ></i> Submit</button>
+                <button  style="margin-bottom: -14px" class="btn btn-sm btn-success" ><i class="fa fa-dot-circle-o" ></i> Submit</button>
 				&nbsp;
                 <button type="reset" style="margin-bottom: -14px" class="btn btn-sm btn-danger"><i class="fa fa-ban"></i> Reset</button>
             </div>

src/app/views/masters/fees-master/fees-master.component.ts

@@ -1,25 +1,61 @@
 import { Component, OnInit } from '@angular/core';
 import {FormsModule} from '@angular/forms';
 
+
 @Component({
   selector: 'app-fees-master',
   templateUrl: './fees-master.component.html',
   styleUrls: ['./fees-master.component.scss']
 })
 export class FeesMasterComponent implements OnInit {
+  model: any = {};
+  a;
   msg = 'Hello world';
-
   constructor() { }
 
   ngOnInit() {
+
   }
- onSubmit() {
+  onSubmit() {
- 
+  
-    console.log("Form Submitted!");
+   alert('SUCCESS!! :-)\n\n' + JSON.stringify(this.model))
- 
+  // alert('SUCCESS!! :-)\n\n' + JSON.stringify(this.model.Feesdes))
-}
+  // alert('SUCCESS!! :-)\n\n' + JSON.stringify(this.model.active))
-valueChange(value)
+
-{
+   var agesArr = [{a:1}, {a:2}, {a:3},
-alert(value);
+    {a:4}];
-}
+    
+    var roots = agesArr.filter(function(ages){
+      return ages.a>2;
+   
+     
+    });
+    function root()
+    {
+    var agAr=[1,2,3,4];
+    var abc = agAr.map(Math.sqrt);
+    return abc; 
+     }
+     
+
+
+
+
+
+    var playersArr = [
+    {name: 'Jason', footedness: 'left', position: 'forward'},
+    {name: 'Blake', footedness: 'right', position: 'defense'},
+    {name: 'Philip', footedness: 'right', position: 'goalie'},
+    {name: 'Logan', footedness: 'left', position: 'defense'},
+    {name: 'Will', footedness: 'right', position: 'forward'}
+];
+var leftFootArr = playersArr.filter(function(player){
+    return player.footedness === 'right';
+});
+console.log(leftFootArr);
+  
+   
+  
+  }
+  
 }

src/app/views/masters/form-list/form-list.component.html

@@ -1,7 +1,7 @@
 <div class="col-lg-12" *ngIf="!show">
     <tabset>
         <tab>
-            <ng-template tabHeading> From List</ng-template>
+            <ng-template tabHeading> Form List</ng-template>
             <div class="card">
                 <div class="card-header">
                     <i class="fa fa-align-justify"></i> Form List
@@ -60,7 +60,7 @@
             </div>
         </tab>
         <tab>
-            <ng-template tabHeading> Add From</ng-template>
+            <ng-template tabHeading> Add Form</ng-template>
             <div class="card">
                 <div class="card-header">
                     <i class="fa fa-align-justify"></i> Form Details
@@ -78,6 +78,7 @@
                                 <select class="form-control" id="formType" placeholder="Select Form Type">
                                                     <option disabled>Select Form Type</option>
                                                     <option>Admission Form</option>
+                                                    <option>Exam Timetable</option>
                                                 </select>
                             </div>
                             <div class="col-md-4">

src/app/views/studymaterial/allocatematerial/allocatematerial.component.html

@@ -197,7 +197,7 @@
                         <br>
                          <div class="row">
                          <div class="col-md-4">
-              <label for="company"><strong>Total StudyMaterials</strong></label>
+              <label for="company"><strong>Total StudyMaterials On Hand</strong></label>
               <input type="text" class="form-control" id="company" placeholder="150">         
                  </div>
                     </div>

src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.html

@@ -6,7 +6,7 @@
       
 	 <div class="card"> 
          <div class="card-header">
-                    <i class="fa fa-align-justify"></i>Received Study Materials
+                    <i class="fa fa-align-justify"></i>Study Materials On Hand
                 </div>
                
                  <div class="card-body">
@@ -126,13 +126,30 @@
     <tab>
  <ng-template tabHeading>Received Study Materials</ng-template>
   
+             
+         
   <div class="card">
   <div class="card-header">
           <strong>Study Material</strong>
         </div>
-		<br>
         <form action="" method="post" class="form-horizontal">
 		<div class="card-body">
+             <div class="form-group row">
+              <label for="chkPassport" class="col-md-12 form-control-label"><strong>Received by</strong></label>
+              <div class="col-md-6">
+               
+                 <label class="checkbox-inline" for="inline-checkbox1">
+                  <input type="checkbox" id="chkPassport" name="vendor"  [(ngModel)]="model.Feesdes" (click)="ShowHideDiv($event)">&nbsp;&nbsp;Vendor
+                </label>
+               
+              </div>
+              
+ <div id="dvPassport" style="display: none">
+           Vendor Details:
+      <input type="text" id="txtPassportNumber" />
+          </div>
+            </div>
+            
           <div class="form-group row">
              <div class="col-md-4 ">
              <label class="col-md-6 form-control-label" for="select">Select University<span class="required">*</span></label>

src/app/views/studymaterial/receivedmaterial/receivedmaterial.component.ts

@@ -6,10 +6,19 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./receivedmaterial.component.scss']
 })
 export class ReceivedmaterialComponent implements OnInit {
-
+ model: any = {};
   constructor() { }
 
   ngOnInit() {
   }
-
+  save()
+  {
+    alert('testing');
+  }
+   ShowHideDiv(chkPassport) {
+     
+        var dvPassport = document.getElementById("chkPassport");
+        dvPassport.style.display = chkPassport.isTrusted ? "block" : "none";
+    }
+    
 }