dbscan also reports lang tables, minor cs fix

Author: thevikas

css/main.css

@@ -376,4 +376,9 @@ div.chmin
 div.states div.chmin img.picture
 {
 	margin-top: -35px;
+}
+
+h2 a.editlink
+{
+	float:right;
 }

protected/commands/ToolsCommand.php

@@ -99,9 +99,13 @@ public function actionDBScan($save = false)
 
 		    $tabledata['count'] = $ctr;    		
 		    if($tabledata['count'] != $oldcache[$tablename]['count'])
-		        $changedtables[$tablename] = $tablename;
-		        
+		        $changedtables[$tablename] = $tablename;		    
+		    
+            #201805231626:thevikas:Kovai:Patch to consider xxxLang tables too 
 		    $cache[$tablename] = $tabledata;
+		    $beh = $obj2->behaviors();
+		    if(isset($beh['ml']) && isset($changedtables[$tablename]))
+		        $changedtables[$tablename . 'Lang'] = $tablename . 'Lang';
     		#echo "$table\t$maxpknum\t$maxcreated\t$maxupdated\t$ctr\n";
     	}
     	if($save)

protected/models/Officer.php

@@ -45,29 +45,7 @@ class Officer extends CActiveRecord
     const DESIG_HEALTHOFFICER = 'HEALTHOFFICER';
     const DESIG_DEPUTYHEALTHOFFICER = 'DEPUTYHEALTHOFFICER';
     const DESIG_CHIEFENGINEER = 'CHIEFENGINEER';
-    /*
-     * static $designstr = [
-    		//duplicates
-    		Officer::DESIG_CHIEFENGINEER => __('Chief Engineer (I/C)'),
-    		Officer::DESIG_HEALTHOFFICER => __('Health Officer (I/C)'),
-    		Officer::DESIG_HEALTHOFFICER => __('Medical Officer of Health'),
-    		//originals
-    		Officer::DESIG_DEPUTYCOMMISSIONER => __('Deputy Commissioner'),
-    		Officer::DESIG_JOINTCOMMISSIONER => __('Joint Commissioner'),
-    		Officer::DESIG_ASSTCOMMISSIONER => __('Assisstant Commissioner'),
-    		Officer::DESIG_EXECENGINEER => __('Executive Engineer'),
-    		Officer::DESIG_CHIEFENGINEER => __('Chief Engineer'),
-    		Officer::DESIG_HEALTHOFFICER => __('Health Officer'),
-    		Officer::DESIG_DEPUTYHEALTHOFFICER => __('Deputy Health Officer'),
-    		Officer::DESIG_ASSTEXECENGINEER => __('Assistant Executive Engineer'),
-    		Officer::DESIG_ASSTTOWNPLANNER => __('Assistant Town Planning Officer'),
-    		Officer::DESIG_ASSTREVENUEOFF => __('Assistant Revenue Officer'),
-    		Officer::DESIG_ZONALSANITORYOFF => __('Zonal Sanitary Officer'),
-    		//
-    		Officer::DESIG_ASSTENGINEER => __('Assistant Engineer'),
-    		Officer::DESIG_WATERSUPPLYOFF => __('Water Supply Engineer'),
-    		Officer::DESIG_SANITORYINSPECTOR => __('Sanitory Inspector'),
-    ];*/
+    
 
    	public static function designstr()
    	{
@@ -271,6 +249,10 @@ function savePicture($url)
         $outfile = '';
         switch($this->desig)
         {
+            case self::DESIG_DEPUTYCOMMISSIONER:
+				$outfile = strtolower($this->district->state->slug . '_' . $this->district->slug . '_' . $desig . '.jpg');
+				$stateobj = $this->district->state;
+                break;
             case self::DESIG_DEPUTYCHIEFMINISTER:
                 $outfile = strtolower($stateobj->slug . '_' . $desig . '_' . time() . '.jpg');
                 break;

protected/views/site/_district.php

@@ -17,12 +17,20 @@
         break;
 }
 ?>
+<div class="view district <?=empty ( $data->picture ) ? '' : 'pic'?>">
+<h2 class="acname"><?=$label2?><?php
+if(Yii::app()->user->checkAccess('ADD_CHIEF_MINISTER'))
+echo  ' ' . CHtml::link(__('Edit'),['/officer/update','id' => $data->id_officer],['class' => 'editlink']);
+ ?></h2>
+<?php
+if (! empty ( $data->picture ))
+    echo CHtml::image ( '/images/pics/' . $data->picture, $data->name, [ 
+            'class' => 'picture amly' 
+    ] );
+
 
-<div class="view district">
-    <h2 class="acname"><?=$label2?></h2>
 
-    <?php
-    $att = [array ( // related city displayed as a link
+$att = [array ( // related city displayed as a link
             'label' => $label,
             'name' => 'name',
     )];
@@ -69,7 +77,22 @@
                     return implode(' ',$rt);
         }
         ];
-    
+    if (! empty ( $data->website ))
+        $att [] = [ 
+                'type' => 'raw',
+                'name' => 'website',
+                'label' => __ ( 'Website' ),
+                'value' => function ($data)
+                {
+                    return CHtml::link($data->website,$data->website);
+                } 
+        ];
+        if (! empty ( $data->address ))
+        $att [] = [ 
+                'name' => 'address',
+        ];
+
+
     $this->widget ( 'zii.widgets.CDetailView', 
             array (
                     'data' => $data,

protected/views/state/_districteditor.php

@@ -2,11 +2,12 @@
 /* @var $this StateController */
 /* @var $district District */
 ?>
-<div class="view">';
+<div class="view">
 <h2><?= __ ( 'Data Editor' )?></h2>
 
 <ol>
-<li><?=CHtml::link(__('Add Deputy Commissioner'),['officer/create','id_state' => $district->id_state,'id_district' => $district->id_district ])?>
+<li><?=CHtml::link(__('Add Deputy Commissioner'),
+['officer/create','id_state' => $district->id_state,'id_district' => $district->id_district ])?>
 </ol>
 
 </div>