Merge branch 'feature-theme' into 'develop'

field change

See merge request manzarH/dic-global-dev!439

modules/custom/dicindialtd/dicindialtd.module

@@ -167,11 +167,11 @@ function _block_corporate_news_and_announcements_view_callback_pdfs($cyear = 0,$
     if(isset($cyear) && intval($cyear)){
       $queryNids = db_select('node', 'n')
 				->distinct();
-      $queryNids->join('field_data_field_uploaded_year', 'y', 'y.entity_id = n.nid AND y.revision_id = n.vid');
+      $queryNids->join('field_data_field_year', 'y', 'y.entity_id = n.nid AND y.revision_id = n.vid');
 	  $queryNids->join('field_data_field_category', 'c', 'c.entity_id = n.nid AND c.revision_id = n.vid');
       $queryNids->condition('y.entity_type',  'node')
                 ->condition('y.bundle',       'investors');
-	  $queryNids ->where('EXTRACT(YEAR FROM y.field_uploaded_year_value) = :year', array('year' => $cyear))
+	  $queryNids ->where('EXTRACT(YEAR FROM y.field_year_value) = :year', array('year' => $cyear))
 	 //$queryNids ->where("FROM_UNIXTIME(y.field_uploaded_year_value, '%Y') = :date", array(':date' => $cyear))
                 //->condition('y.field_year_value', $cyear)
 				->condition('c.field_category_tid', $cnews);
@@ -188,14 +188,7 @@ function _block_corporate_news_and_announcements_view_callback_pdfs($cyear = 0,$
       $results = $queryNids->execute()
                  ->fetchCol();
 			   
-			   /* while($record = $results->fetchAssoc()) {
-              print_r($record);
-              }*/
 			   
-			  // print_r($results);
-			  // echo count($results);
-	
-      //
       if(is_array($results) && count($results)){
         $nodes = node_load_multiple($results);
         if(is_array($nodes) && count($nodes)){
@@ -249,12 +242,12 @@ function _block_corporate_news_and_announcements_view_callback_monthly_pdfs($cye
     if(isset($cyear) && intval($cyear)){
       $queryNids = db_select('node', 'n')
 				->distinct();
-      $queryNids->join('field_data_field_uploaded_year', 'y', 'y.entity_id = n.nid AND y.revision_id = n.vid');
+      $queryNids->join('field_data_field_year', 'y', 'y.entity_id = n.nid AND y.revision_id = n.vid');
 	  $queryNids->join('field_data_field_category', 'c', 'c.entity_id = n.nid AND c.revision_id = n.vid');
       $queryNids->condition('y.entity_type',  'node')
                 ->condition('y.bundle',       'investors');
-	  $queryNids ->where('EXTRACT(YEAR FROM y.field_uploaded_year_value) = :year', array('year' => $cyear));
-	  $queryNids ->where('EXTRACT(MONTH FROM y.field_uploaded_year_value) = :month', array('month' => $cmonth));
+	  $queryNids ->where('EXTRACT(YEAR FROM y.field_year_value) = :year', array('year' => $cyear));
+	  $queryNids ->where('EXTRACT(MONTH FROM y.field_year_value) = :month', array('month' => $cmonth));
 
 		$queryNids ->condition('c.field_category_tid', $cnews);