0.6.1

bilalnaqvi · Dec 12, 2016 · 9bab20f · 9bab20f
1 parent fcff7d3
commit 9bab20f
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 47 deletions.
diff --git a/inoerp/modules/lms/academic_year/academic_year_template.php b/inoerp/modules/lms/academic_year/academic_year_template.php
@@ -1,6 +1,6 @@
 <div id ="form_header">
- <form method="post" id="lms_term"  name="lms_term">
-  <span class="heading"><?php echo gettext('Term') ?></span>
+ <form method="post" id="lms_academic_year"  name="lms_academic_year">
+  <span class="heading"><?php $f = new inoform(); echo gettext('Academic Year') ?></span>
   <div id ="form_header">
    <div id="tabsHeader">
     <ul class="tabMain">
@@ -11,15 +11,16 @@
     </ul>
     <div class="tabContainer"> 
      <div id="tabsHeader-1" class="tabContent">
-      <ul class="column header_field"> 
-       <li><?php $f->l_text_field_dr_withSearch('lms_term_id') ?>
-        <a name="show" href="form.php?class_name=lms_term&<?php echo "mode=$mode"; ?>" class="show document_id lms_term_id">
+      <ul class="column header_field two_column_form"> 
+       <li><?php $f->l_text_field_dr_withSearch('lms_academic_year_id') ?>
+        <a name="show" href="form.php?class_name=lms_academic_year&<?php echo "mode=$mode"; ?>" class="show document_id lms_academic_year_id">
          <i class="fa fa-refresh"></i></a> 
        </li>
-       <li><?php $f->l_text_field_d('term_name'); ?></li>
-       <li><?php $f->l_text_field_d('term_code'); ?></li>
+       <li><?php $f->l_text_field_d('academic_year_name'); ?></li>
+       <li><?php $f->l_text_field_d('academic_year_code'); ?></li>
+       <li><?php $f->l_dateTime_field('start_date', $$class->start_date); ?></li>
+			 <li><?php $f->l_dateTime_field('end_Date' , $$class->end_date); ?></li>
 			 <li><?php $f->l_status_field_d('status'); ?></li>
-       <li><?php $f->l_status_field_d('status'); ?></li>
        <li><?php $f->l_text_field_d('description'); ?></li>
       </ul>
      </div>
@@ -34,8 +35,8 @@
         </div>
         <div id ="display_comment_form">
 						<?php
-						$reference_table = 'lms_term';
-						$reference_id = $$class->lms_term_id;
+						$reference_table = 'lms_academic_year';
+						$reference_id = $$class->lms_academic_year_id;
 						?>
         </div>
         <div id="new_comment">
@@ -47,33 +48,17 @@
 
    </div>
   </div>
-  <div id ="form_line" class="form_line"><span class="heading"><?php echo gettext('Other Details') ?></span>
-   <div id="tabsLine">
-    <ul class="tabMain">
-     <li><a href="#tabsLine-1"><?php echo gettext('Term') ?></a></li>
-    </ul>
-    <div class="tabContainer"> 
-     <div id="tabsLine-1" class="tabContent">
-      <div><?php
-					echo $f->text_area_ap(array('name' => 'overview', 'value' => $$class->overview,
-							'row_size' => '10', 'column_size' => '90'));
-					?> 	
-      </div> 
-     </div> 
-    </div>
-   </div> 
-  </div> 
- </form>
+   </form>
 </div>
 <div id="js_data">
  <ul id="js_saving_data">
-  <li class="headerClassName" data-headerClassName="lms_term" ></li>
+  <li class="headerClassName" data-headerClassName="lms_academic_year" ></li>
   <li class="savingOnlyHeader" data-savingOnlyHeader="true" ></li>
-  <li class="primary_column_id" data-primary_column_id="lms_term_id" ></li>
-  <li class="form_header_id" data-form_header_id="lms_term" ></li>
+  <li class="primary_column_id" data-primary_column_id="lms_academic_year_id" ></li>
+  <li class="form_header_id" data-form_header_id="lms_academic_year" ></li>
  </ul>
  <ul id="js_contextMenu_data">
-  <li class="docHedaderId" data-docHedaderId="lms_term_id" ></li>
-  <li class="btn1DivId" data-btn1DivId="lms_term_id" ></li>
+  <li class="docHedaderId" data-docHedaderId="lms_academic_year_id" ></li>
+  <li class="btn1DivId" data-btn1DivId="lms_academic_year_id" ></li>
  </ul>
 </div>
diff --git a/inoerp/modules/lms/academic_year/class_lms_academic_year.inc b/inoerp/modules/lms/academic_year/class_lms_academic_year.inc
@@ -24,7 +24,7 @@ class lms_academic_year extends dbObject {
  public static $system_info = [
 		 'name' => 'academic_year',
 		 'number' => '8304',
-		 'description' => 'academic_year',
+		 'description' => 'LMS Academic Year',
 		 'version' => '0.1.1',
 		 'db_version' => '1001',
 		 'mod_version' => '1.1.1',
@@ -35,10 +35,11 @@ class lms_academic_year extends dbObject {
  public $field_a = [
 		 'lms_academic_year_id',
 		 'academic_year_name',
+		 'start_date',
+		 'end_date',
 		 'academic_year_code',
-		 'overview',
-		 'description',
 		 'status',
+		 'description',
 		 'created_by',
 		 'creation_date',
 		 'last_update_by',
@@ -48,23 +49,20 @@ class lms_academic_year extends dbObject {
 		 'academic_year_name',
 		 'academic_year_code',
  ];
- public $column = [
-		 'lms_academic_year_id',
-		 'academic_year_name',
-		 'academic_year_code',
-		 'overview',
- ];
+
  public $requiredField = [
-		 'academic_year_name',
-		 'academic_year_code'
+		 'academic_year_name'
  ];
 
+
+
  public $lms_academic_year_id;
 public $academic_year_name;
+public $start_date;
+public $end_date;
 public $academic_year_code;
-public $overview;
-public $description;
 public $status;
+public $description;
 public $created_by;
 public $creation_date;
 public $last_update_by;
@@ -75,8 +73,7 @@ public $last_update_date;
 		 '_show_update_path' => 1,
 		 '_show_view_path' => 1,
  ];
- public $pageTitle = " academic_year  "; //page Title
-
+ public $pageTitle = " Academic Year  "; //page Title
 
 }