[Gdtc-commits] r1667 - /trunk/gdtc/include/coherence.php

[bdrieu]

Author: benj
Date: Tue May 10 11:40:07 2016
New Revision: 1667

URL: http://svn.gna.org/viewcvs/gdtc?rev=1667&view=rev
Log:
Simplify code, add new "has contact" test and unfuck test

Modified:
    trunk/gdtc/include/coherence.php

Modified: trunk/gdtc/include/coherence.php
URL: 
http://svn.gna.org/viewcvs/gdtc/trunk/gdtc/include/coherence.php?rev=1667&r1=1666&r2=1667&view=diff
==============================================================================
--- trunk/gdtc/include/coherence.php    (original)
+++ trunk/gdtc/include/coherence.php    Tue May 10 11:40:07 2016
@@ -60,7 +60,8 @@
                 check_cbrecur_not_created(),
                 check_no_current_membership(),
                 check_cmcic_periodicity_is_fucked () , 
-                check_cmcic_amount_is_fucked () 
+                check_cmcic_amount_is_fucked (),
+                check_entity_has_contact (),
  );
 }
 
@@ -113,22 +114,14 @@
     $output = Array ( "Date de renouvellement != date fin paiement (membre 
ayant réglé une cotisation) : " . sizeof($results). " résultat(s)", 
'membership_renewal_date_is_fucked', 1 );
     foreach ( $results as $result )
     {
-       if ( $result [ 'actor_type' ] == 'person' )
-       {
-           $name = sprintf ( "%s %s", 
-                             $result [ 'firstname' ], $result [ 'person_name' 
]);
-       }
-       else
-       {
-           $name = $result [ 'entity_name' ];
-       }
+        $name = actor_get_clickable_name ( $result );
        $output[3][] = Array ( $result [ 'actor_id' ], 
-                              $name,
-                              sprintf ( "%s au lieu de %s",
-                                        sql2date($result [ 
'membership_renewal_date' ]), 
-                                        sql2date($result [ 'end_date' ]) ) );
-    }
-
+                            $name,
+                            sprintf ( "%s au lieu de %s",
+                                      sql2date($result [ 
'membership_renewal_date' ]), 
+                                      sql2date($result [ 'end_date' ]) ) );
+    }
+    
     return $output;
 }
 
@@ -158,15 +151,7 @@
   $output = Array ( "Periodicité nulle : " . sizeof($results). " 
résultat(s)", false, 0 );
   foreach ( $results as $result )
     {
-      if ( $result [ 'actor_type' ] == 'person' )
-       {
-         $name = sprintf ( "%s %s",
-                           $result [ 'firstname' ], $result [ 'person_name' ] 
);
-       }
-      else
-       {
-         $name = $result [ 'entity_name' ];
-       }
+      $name = actor_get_clickable_name ( $result );
       $output[3][] = Array ( $result [ 'actor_id' ], 
                             $name,
                             "Periodicité nulle" );
@@ -184,15 +169,7 @@
   $output = Array ( "Date  debut prel > fin : " . sizeof($results). " 
résultat(s)", 'prelevement_start_date_is_fucked', 1 );
   foreach ( $results as $result )
     {
-      if ( $result [ 'actor_type' ] == 'person' )
-       {
-         $name = sprintf ( "%s %s",
-                           $result [ 'firstname' ], $result [ 'person_name' ] 
);
-       }
-      else
-       {
-         $name = $result [ 'entity_name' ];
-       }
+      $name = actor_get_clickable_name ( $result );
       $output[3][] = Array ( $result [ 'actor_id' ], 
                             $name,
                             sprintf ( "Renouvellement d&eacute;but <b>%s</b> 
&gt; <b>%s</b>",
@@ -234,15 +211,7 @@
   $output = Array ( "Date de renouvellement != fin prelevement : " . 
sizeof($results). " résultat(s)", 'prelevement_renewal_date_is_fucked', 1 );
   foreach ( $results as $result )
     {
-      if ( $result [ 'actor_type' ] == 'person' )
-       {
-         $name = sprintf ( "%s %s",
-                           $result [ 'firstname' ], $result [ 'person_name' ] 
);
-       }
-      else
-       {
-         $name = $result [ 'entity_name' ];
-       }
+      $name = actor_get_clickable_name ( $result );
       $output[3][] = Array ( $result [ 'actor_id' ], 
                             $name,
                             sprintf ( "Renouvellement <b>%s</b> au lieu de 
<b>%s</b>",
@@ -279,16 +248,8 @@
   $output = Array ( "Prelevement non créé : " . sizeof($results). " 
résultat(s)", 'prelevement_not_created', 1 );
   foreach ( $results as $result )
     {
-      if ( $result [ 'actor_type' ] == 'person' )
-       {
-         $output[3][] = Array ( $result [ 'actor_id' ], 
-                                sprintf ( "%s %s", $result [ 'firstname' ], 
$result [ 'person_name' ] ) );
-       }
-      else
-       {
-         $output[3][] = Array ( $result [ 'actor_id' ], 
-                                $result [ 'entity_name' ] );
-       }
+      $output[3][] = Array ( $result [ 'actor_id' ], 
+                            actor_get_clickable_name ( $result ) );
     }
 
   return $output;
@@ -369,16 +330,8 @@
   $output = Array ( "Cbrecur non créé : " . sizeof($results). " 
résultat(s)", 'cbrecur_not_created', 1 );
   foreach ( $results as $result )
     {
-      if ( $result [ 'actor_type' ] == 'person' )
-       {
-         $output[3][] = Array ( $result [ 'actor_id' ], 
-                                sprintf ( "%s %s", $result [ 'firstname' ], 
$result [ 'person_name' ] ) );
-       }
-      else
-       {
-         $output[3][] = Array ( $result [ 'actor_id' ], 
-                                $result [ 'entity_name' ] );
-       }
+      $output[3][] = Array ( $result [ 'actor_id' ], 
+                                actor_get_clickable_name ( $result ) );
     }
 
   return $output;
@@ -458,16 +411,8 @@
   $output = Array ( "État membership/statut incohérent : " . 
sizeof($results). " résultat(s)", 'no_current_membership', 0 );
   foreach ( $results as $result )
     {
-      if ( $result [ 'actor_type' ] == 'person' )
-       {
-         $output[3][] = Array ( $result [ 'actor_id' ], 
-                                sprintf ( "%s %s", $result [ 'firstname' ], 
$result [ 'person_name' ] ) );
-       }
-      else
-       {
-         $output[3][] = Array ( $result [ 'actor_id' ], 
-                                $result [ 'entity_name' ] );
-       }
+      $output[3][] = Array ( $result [ 'actor_id' ], 
+                            actor_get_clickable_name ( $result ) );
     }
 
   return $output;
@@ -505,16 +450,7 @@
       $computed_amount = compute_real_cbrecur_amount ( $result );
       if ( $computed_amount != $result [ 'amount' ] )
        {
-         if ( $result [ 'actor_type' ] == 'person' )
-           {
-             $name = sprintf ( "%s %s",
-                               $result [ 'firstname' ], $result [ 
'person_name' ] );
-           }
-         else
-           {
-             $name = $result [ 'entity_name' ];
-           }
-         
+         $name = actor_get_clickable_name ( $result );   
          $output[3][] = Array ( $result [ 'actor_id' ], 
                                 $name,
                                 sprintf ( "%.2f&euro; != calculated 
%.2f&euro;", $result [ 'amount' ], $computed_amount ) );
@@ -571,22 +507,10 @@
   $output = Array ( "Problème de périodicity récur : " . sizeof($results). 
" résultat(s)", 'cmcic_periodicity_is_fucked', 1 );
   foreach ( $results as $result )
     {
-      if ( $computed_amount != $result [ 'amount' ] )
-       {
-         if ( $result [ 'actor_type' ] == 'person' )
-           {
-             $name = sprintf ( "%s %s",
-                               $result [ 'firstname' ], $result [ 
'person_name' ] );
-           }
-         else
-           {
-             $name = $result [ 'entity_name' ];
-           }
-         
-         $output[3][] = Array ( $result [ 'actor_id' ], 
-                                $name,
-                                "periodicity is NULL" );
-       }
+      $name = actor_get_clickable_name ( $result );
+      $output[3][] = Array ( $result [ 'actor_id' ], 
+                            $name,
+                            "periodicity is NULL" );
     }
     
   if ( $output[3] )
@@ -630,4 +554,28 @@
 }
 
 
+
+/***** CB recur periodicity */
+
+function check_entity_has_contact ()
+{
+  $results = basic_query ( " AND actor.actor_type = 'entity' " .
+                          " HAVING NOT EXISTS (SELECT entity_id FROM employee 
WHERE entity_id = entity.actor_id ) " );
+  if ( ! $results ) return;
+
+  $output = Array ( "Entité n'ayant pas de contact : " . sizeof($results). " 
résultat(s)", 'entity_has_contact', 0 );
+  foreach ( $results as $result )
+    {
+      $name = actor_get_clickable_name ( $result );
+      $output[3][] = Array ( $result [ 'actor_id' ], 
+                            $name,
+                            "pas de contact" );
+    }
+    
+  if ( $output[3] )
+    return $output;
+}
+
+
+
 ?>


_______________________________________________
Gdtc-commits mailing list
Gdtc-commits@gna.org
https://mail.gna.org/listinfo/gdtc-commits