Import latest app updates from streamline

An updated set of source files and initialization was provided by streamline to
address issues observed during initial testing. These files have been updated in
order to generate a new set of app images.

docker/streamline-src/app/Models/AncDeliveryPlan.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class AncDeliveryPlan extends Model implements Auditable
+{
+    use HasFactory; 
+     // use laravel-auditing to track database changes
+     use \OwenIt\Auditing\Auditable;
+
+     // use for soft deletes
+     use SoftDeletes;
+ 
+     // mutate to dates
+     protected $dates = ['deleted_at'];
+}

docker/streamline-src/app/Models/AntenatalMotherHistory.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class AntenatalMotherHistory extends Model implements Auditable
+{
+    use HasFactory;
+
+    // use laravel-auditing to track database changes
+    use \OwenIt\Auditing\Auditable;
+
+    // use for soft deletes
+    use SoftDeletes;
+
+    protected $guarded = ['id'];
+
+    // mutate to dates
+    protected $dates = ['deleted_at'];
+}
+

docker/streamline-src/app/Models/CaesarianSection.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class CaesarianSection extends Model implements Auditable
+{
+    use HasFactory; 
+    public $timestamps = true;
+
+    // use laravel-auditing to track database changes
+    use \OwenIt\Auditing\Auditable;
+
+    // use for soft deletes
+    use SoftDeletes;
+
+    protected $guarded = ['id'];
+
+    // mutate to dates
+    protected $dates = ['deleted_at'];
+}

docker/streamline-src/app/Models/CancerProtocol.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class CancerProtocol extends Model implements Auditable
+{
+    use \OwenIt\Auditing\Auditable;
+
+    // use for soft deletes
+    use SoftDeletes;
+
+    use HasFactory;
+}

docker/streamline-src/app/Models/CancerProtocolWardChart.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class CancerProtocolWardChart extends Model implements Auditable
+{
+    use HasFactory;
+
+    // use laravel-auditing to track database changes
+    use \OwenIt\Auditing\Auditable;
+
+    // use for soft deletes
+    use SoftDeletes;
+}

docker/streamline-src/app/Models/CardioEchoTemplate.php

@@ -3,8 +3,17 @@
 namespace Streamline\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
 
-class CardioEchoTemplate extends Model {
+class CardioEchoTemplate extends Model implements Auditable 
+{
     protected $guarded = [];
     protected $table = "cardio_echo_template";
+
+    // use laravel-auditing to track database changes
+    use \OwenIt\Auditing\Auditable;
+
+    // use for soft deletes
+    use SoftDeletes;
 }

docker/streamline-src/app/Models/DiagnosisCategory.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class DiagnosisCategory extends Model implements Auditable {
+    use HasFactory;
+    use \OwenIt\Auditing\Auditable;
+    use SoftDeletes;
+}

docker/streamline-src/app/Models/DrugRoute.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class DrugRoute extends Model implements Auditable
+{
+    use \OwenIt\Auditing\Auditable;
+
+    // use for soft deletes
+    use SoftDeletes;
+
+    use HasFactory;
+}

docker/streamline-src/app/Models/EyeGlasses.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class EyeGlasses extends Model implements Auditable {
+    use HasFactory;
+    protected $table = 'eye_glasses';
+    // use laravel-auditing to track database changes
+    use \OwenIt\Auditing\Auditable;
+
+    // use for soft deletes
+    use SoftDeletes;
+
+    public static function boot() {
+        parent::boot();
+
+        self::updated(function($model){
+            save_new_stock_level($model->id, 7);
+        });
+    }
+}

docker/streamline-src/app/Models/GenderBasedViolence.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class GenderBasedViolence extends Model implements Auditable
+{
+    use HasFactory;
+
+    public $timestamps = true;
+
+    // use laravel-auditing to track database changes
+    use \OwenIt\Auditing\Auditable;
+
+    // use for soft deletes
+    use SoftDeletes;
+
+    protected $fillable = [
+        'triage_id',
+        'patient_id',
+        'child_feeling_unsafe',
+        'past_12_threatened_humiliated_caused_afraid_when',
+        'past_12_threatened_humiliated_caused_afraid_by_whom',
+        'past_12_prevented_coming_clinic_medication_treatment',
+        'past_12_any_threatened_or_harmed',
+        'past_12_any_touched_private_parts_not_want',
+        'past_12_any_forced_sex',
+        'past_12_any_refused_condom_when_wanted',
+        'others',
+        'created_by',
+        'updated_by'
+    ];
+
+    protected $guarded = ['id'];
+
+    // mutate to dates
+    protected $dates = ['deleted_at'];
+}

docker/streamline-src/app/Models/HivGenderBaseViolence.php

@@ -36,6 +36,5 @@ class HivGenderBaseViolence extends Model
         'experienced_unwanted_touching_of_private_parts_in_past_12_months',
         'experienced_forced_sex_in_past_12_months',
         'experienced_condom_refusal_in_past_12_months',
-
-];
+    ];
 }

docker/streamline-src/app/Models/HmisCategoryOptions.php

@@ -18,4 +18,7 @@ class HmisCategoryOptions extends Model implements Auditable
 
     // mutate to dates
     protected $dates = ['deleted_at'];
+
+    //Mass Assignment
+    protected $fillable = ['name', 'number','hmis_category_id','parent_option','created_by'];
 }

docker/streamline-src/app/Models/InvoicePaymentRecord.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class InvoicePaymentRecord extends Model implements Auditable
+{
+    protected array $dates = ['deleted_at'];
+
+    // use laravel-auditing to track database changes
+    use \OwenIt\Auditing\Auditable;
+    use SoftDeletes;
+}

docker/streamline-src/app/Models/OpticalStockReconciliation.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class OpticalStockReconciliation extends Model implements Auditable {
+    use HasFactory;
+
+    use \OwenIt\Auditing\Auditable;
+
+    use SoftDeletes;
+}

docker/streamline-src/app/Models/OrderedCancerProtocols.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class OrderedCancerProtocols extends Model implements Auditable
+{
+    use \OwenIt\Auditing\Auditable;
+
+    // use for soft deletes
+    use SoftDeletes;
+
+    use HasFactory;
+}

docker/streamline-src/app/Models/PatientInpatientVitals.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class PatientInpatientVitals extends Model implements Auditable {
+    use HasFactory;
+
+    use \OwenIt\Auditing\Auditable;
+
+    // use for soft deletes
+    use SoftDeletes;
+}

docker/streamline-src/app/Models/PatientRegistrationField.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class PatientRegistrationField extends Model implements Auditable
+{
+    use HasFactory;
+
+    // use laravel-auditing to track database changes
+    use \OwenIt\Auditing\Auditable;
+
+    // use for soft deletes
+    use SoftDeletes;
+}

docker/streamline-src/app/Models/SlitLampTestArea.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class SlitLampTestArea extends Model implements Auditable {
+    use HasFactory;
+    use \OwenIt\Auditing\Auditable;
+    use SoftDeletes;
+}

docker/streamline-src/app/Models/SlitLampTestAreaValue.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class SlitLampTestAreaValue extends Model implements Auditable {
+    use HasFactory;
+    use \OwenIt\Auditing\Auditable;
+    use SoftDeletes;
+}

docker/streamline-src/app/Models/TreatmentSheetDispensations.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class TreatmentSheetDispensations extends Model implements Auditable
+{
+    use \OwenIt\Auditing\Auditable;
+
+    // use for soft deletes
+    use SoftDeletes;
+
+    use HasFactory;
+}

docker/streamline-src/app/Models/User.php

@@ -4,6 +4,7 @@ namespace Streamline\Models;
 
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Support\Facades\Auth;
 use Spatie\Permission\Traits\HasRoles;
 use OwenIt\Auditing\Contracts\Auditable;
 use Illuminate\Support\Carbon;
@@ -13,12 +14,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
 
 class User extends Authenticatable implements Auditable {
 
-//    use HasApiTokens;
     use Notifiable;
     use HasRoles;
-    /*
-     * use laravel-auditing to track database changes
-     */
     use \OwenIt\Auditing\Auditable;
 
     use SoftDeletes;
@@ -50,12 +47,16 @@ class User extends Authenticatable implements Auditable {
     /*
      * Below are some mutators
      */
+    private string $first_name;
+    private string $last_name;
 
-    public function setExpiryDateAttribute($expiry_date) {
+    public function setExpiryDateAttribute($expiry_date): void
+    {
         $this->attributes['expiry_date'] = empty($expiry_date) ? NULL : Carbon::createFromFormat('d/m/Y', $expiry_date)->format('Y-m-d');
     }
 
-    public function setLastDonationDateAttribute($last_donation_date) {
+    public function setLastDonationDateAttribute($last_donation_date): void
+    {
         $this->attributes['last_donation_date'] = empty($last_donation_date) ? NULL : Carbon::createFromFormat('d/m/Y', $last_donation_date)->format('Y-m-d');
     }
 
@@ -63,20 +64,17 @@ class User extends Authenticatable implements Auditable {
      * Accessors    
      */
 
-    public function getExpiryDateAttribute($expiry_date) {
-        $slash_date = $expiry_date == NULL ? '' : Carbon::createFromFormat('Y-m-d', $expiry_date)->format('d/m/Y');
-        return $slash_date;
+    public function getExpiryDateAttribute($expiry_date): string
+    {
+        return $expiry_date == NULL ? '' : Carbon::createFromFormat('Y-m-d', $expiry_date)->format('d/m/Y');
     }
 
-    public function getLastDonationDateAttribute($last_donation_date) {
-        $slash_date = '';//$last_donation_date == NULL ? '' : Carbon::createFromFormat('Y-m-d', $last_donation_date)->format('d/m/Y');
-        return $slash_date;
+    public function getLastDonationDateAttribute($last_donation_date): string
+    {
+        //$last_donation_date == NULL ? '' : Carbon::createFromFormat('Y-m-d', $last_donation_date)->format('d/m/Y');
+        return '';
     }
 
-    /*
-     * Other methods
-     */
-
     public static function resolveId() {
         return Auth::check() ? Auth::user()->getAuthIdentifier() : null;
     }
@@ -86,4 +84,9 @@ class User extends Authenticatable implements Auditable {
         return $this->hasOne('Streamline\Models\PasswordSecurity');
     }
 
+    public function getFullNameAttribute(): string
+    {
+        return $this->first_name . ' ' . $this->last_name;
+    }
+
 }

docker/streamline-src/app/Models/UterusOperation.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use OwenIt\Auditing\Contracts\Auditable;
+
+class UterusOperation extends Model implements Auditable
+{
+    use HasFactory;
+
+    public $timestamps = true;
+
+    // use laravel-auditing to track database changes
+    use \OwenIt\Auditing\Auditable;
+
+    // use for soft deletes
+    use SoftDeletes;
+
+    protected $guarded = ['id'];
+
+    // mutate to dates
+    protected $dates = ['deleted_at'];
+}

docker/streamline-src/app/Models/WardStockReconciliation.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Streamline\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use OwenIt\Auditing\Contracts\Auditable;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class WardStockReconciliation extends Model implements Auditable
+{
+    use HasFactory;
+    // use laravel-auditing to track database changes
+    use \OwenIt\Auditing\Auditable;
+
+    // use for soft deletes
+    use SoftDeletes;
+
+    // mutate to dates
+    protected $dates = ['deleted_at'];
+}