From 29f6b400d62287279c08a3628c79390288006ee1 Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Thu, 14 Feb 2019 13:18:09 +0530
Subject: [PATCH] issue no :0001658

---
 Apollo/api/application/controllers/Forget_Controller.php | 3 ++-
 Apollo/api/application/models/Forgot_model.php           | 8 ++++++++
 Apollo/assets/views/login_forgot.html                    | 8 ++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Apollo/api/application/controllers/Forget_Controller.php b/Apollo/api/application/controllers/Forget_Controller.php
index 3da21f75..0252a395 100755
--- a/Apollo/api/application/controllers/Forget_Controller.php
+++ b/Apollo/api/application/controllers/Forget_Controller.php
@@ -53,7 +53,8 @@ class Forget_Controller extends REST_Controller {
         }
         return $randomString;
     }
-         $password= generateRandomString();
+         // $password= generateRandomString();
+       $password="abc123";
        $details['Password'] = md5($password);
 
               $loginDetails = $this->forgot_model->forget($details, $password);// Check if the users data store contains users (in case the database result returns NULL)
diff --git a/Apollo/api/application/models/Forgot_model.php b/Apollo/api/application/models/Forgot_model.php
index 8382aba7..263d2aa7 100755
--- a/Apollo/api/application/models/Forgot_model.php
+++ b/Apollo/api/application/models/Forgot_model.php
@@ -40,6 +40,11 @@ class Forgot_model extends CI_Model {
         }
         
         if($forgotDetails1){
+
+
+            $time = date('Y-m-d');
+            $dateTime = $time;
+            $user['Password_Date'] = $dateTime;
                 $this->db->select('ID,Emailid,MobileNumber,Password');
                 $this->db->from(LOGIN);
                 $this->db->where('MobileNumber', $user['MobileNumber']);
@@ -81,6 +86,9 @@ class Forgot_model extends CI_Model {
 
     public function smssend($mobile,$messa)
     {
+        // echo $mobile;
+        // echo $messa;
+        // die();
         $message ="Your new password for logging into Apollo student portal is $messa. Please change the password as soon as you login.";
         $mobile = "91$mobile";
    
diff --git a/Apollo/assets/views/login_forgot.html b/Apollo/assets/views/login_forgot.html
index 684cd49a..61180da9 100755
--- a/Apollo/assets/views/login_forgot.html
+++ b/Apollo/assets/views/login_forgot.html
@@ -14,15 +14,15 @@
 						Forget Password?
 					</legend>
 					<p style="color: sandybrown;">
-						Enter your Registered Mobile Number below to reset your password.
+						Enter your Employee ID below to reset your password.
 					</p>
 					<div class="form-group" ng-class="{'has-error':form.mobilenumber.$dirty && form.mobilenumber.$invalid, 'has-success':form.mobilenumber.$valid}">
 							<span class="input-icon">
-										<input type="text" class="form-control"  ng-pattern="/^[0-9]*$/" ng-minlength="10" ng-maxlength="12"  ng-model="myModel.userMobile" name="mobilenumber" placeholder="MobileNumber"  required> <i class="fa fa-mobile"></i>
+										<input type="text" class="form-control"  ng-maxlength="12"  ng-model="myModel.userMobile" name="mobilenumber" placeholder="Employee ID"  required> <i class="fa fa-mobile"></i>
 							</span>
-							<span class="error text-small block" ng-if="form.mobilenumber.$dirty && form.mobilenumber.$error.required"> mobile number is required. </span>
+							<span class="error text-small block" ng-if="form.mobilenumber.$dirty && form.mobilenumber.$error.required"> Employee ID is required. </span>
 							
-							<span class="error text-small block" ng-if="form.mobilenumber.$error.maxlength || form.mobilenumber.$error.minlength || form.mobilenumber.$error.pattern">Enter a valid mobile number</span>
+							<!-- <span class="error text-small block" ng-if="form.mobilenumber.$error.maxlength || form.mobilenumber.$error.minlength || form.mobilenumber.$error.pattern">Enter a valid mobile number</span> -->
 						</div>
 						
 					<div class="form-actions">