Added the call-to-action button for problems, in the project landing …

…page

app/BusinessLogicLayer/CrowdSourcingProject/CrowdSourcingProjectManager.php

@@ -10,6 +10,7 @@
 use App\Notifications\QuestionnaireResponded;
 use App\Repository\CrowdSourcingProject\CrowdSourcingProjectRepository;
 use App\Repository\CrowdSourcingProject\CrowdSourcingProjectStatusHistoryRepository;
+use App\Repository\CrowdSourcingProject\Problem\CrowdSourcingProjectProblemRepository;
 use App\Repository\LanguageRepository;
 use App\Repository\Questionnaire\QuestionnaireRepository;
 use App\Repository\Questionnaire\Responses\QuestionnaireResponseRepository;
@@ -41,6 +42,7 @@ class CrowdSourcingProjectManager {
     protected CrowdSourcingProjectColorsManager $crowdSourcingProjectColorsManager;
     protected QuestionnaireResponseRepository $questionnaireResponseRepository;
     protected CrowdSourcingProjectTranslationManager $crowdSourcingProjectTranslationManager;
+    protected CrowdSourcingProjectProblemRepository $crowdSourcingProjectProblemRepository;
 
     public function __construct(CrowdSourcingProjectRepository $crowdSourcingProjectRepository,
         QuestionnaireRepository $questionnaireRepository,
@@ -51,7 +53,8 @@ public function __construct(CrowdSourcingProjectRepository $crowdSourcingProject
         LanguageRepository $languageRepository,
         CrowdSourcingProjectColorsManager $crowdSourcingProjectColorsManager,
         QuestionnaireResponseRepository $questionnaireResponseRepository,
-        CrowdSourcingProjectTranslationManager $crowdSourcingProjectTranslationManager) {
+        CrowdSourcingProjectTranslationManager $crowdSourcingProjectTranslationManager,
+        CrowdSourcingProjectProblemRepository $crowdSourcingProjectProblemRepository) {
         $this->crowdSourcingProjectRepository = $crowdSourcingProjectRepository;
         $this->questionnaireRepository = $questionnaireRepository;
         $this->crowdSourcingProjectStatusManager = $crowdSourcingProjectStatusManager;
@@ -62,6 +65,7 @@ public function __construct(CrowdSourcingProjectRepository $crowdSourcingProject
         $this->crowdSourcingProjectColorsManager = $crowdSourcingProjectColorsManager;
         $this->questionnaireResponseRepository = $questionnaireResponseRepository;
         $this->crowdSourcingProjectTranslationManager = $crowdSourcingProjectTranslationManager;
+        $this->crowdSourcingProjectProblemRepository = $crowdSourcingProjectProblemRepository;
     }
 
     public function getCrowdSourcingProjectsForHomePage(): Collection {
@@ -94,15 +98,7 @@ public function getCrowdSourcingProjectBySlug($project_slug, $withRelationships
     public function getCrowdSourcingProjectViewModelForLandingPage(
         $questionnaireIdRequestedInTheURL,
         $project_slug): CrowdSourcingProjectForLandingPage {
-        $userId = null;
-
-        // if the user is logged in, get the user id
-        if (Auth::check()) {
-            $userId = Auth::id();
-        } // else, check if the user is anonymous (by checking the cookie) and get the user id
-        elseif (isset($_COOKIE[UserManager::$USER_COOKIE_KEY]) && intval($_COOKIE[UserManager::$USER_COOKIE_KEY])) {
-            $userId = intval($_COOKIE[UserManager::$USER_COOKIE_KEY]);
-        }
+        $userId = Auth::id() ?? intval($_COOKIE[UserManager::$USER_COOKIE_KEY] ?? 0);
 
         $project = $this->getCrowdSourcingProjectBySlug($project_slug);
 
@@ -122,6 +118,7 @@ public function getCrowdSourcingProjectViewModelForLandingPage(
         $shareUrlForFacebook = '';
         $shareUrlForTwitter = '';
         $countAll = 0;
+        $projectHasPublishedProblems = false;
         if ($questionnaire) {
             $countAll = $this->questionnaireRepository->countAllResponsesForQuestionnaire($questionnaire->id);
             $questionnaireGoalVM = $this->questionnaireGoalManager->getQuestionnaireGoalViewModel($questionnaire, $countAll);
@@ -131,6 +128,9 @@ public function getCrowdSourcingProjectViewModelForLandingPage(
             $shareButtonsModel = new QuestionnaireSocialShareButtons($questionnaire, $idOfUserThatCanShareTheQuestionnaire);
             $shareUrlForFacebook = $shareButtonsModel->getSocialShareURL($project, 'facebook');
             $shareUrlForTwitter = $shareButtonsModel->getSocialShareURL($project, 'twitter');
+        } else {
+            // if there is no questionnaire, we need to check if this project has published problems
+            $projectHasPublishedProblems = $this->crowdSourcingProjectProblemRepository->projectHasPublishedProblems($project->id);
         }
         if ($feedbackQuestionnaire) {
             $userFeedbackQuestionnaireResponse =
@@ -143,6 +143,7 @@ public function getCrowdSourcingProjectViewModelForLandingPage(
         return new CrowdSourcingProjectForLandingPage($project,
             $questionnaire,
             $feedbackQuestionnaire,
+            $projectHasPublishedProblems,
             $userResponse,
             $userFeedbackQuestionnaireResponse,
             $countAll,

app/Models/CrowdSourcingProject/Problem/CrowdSourcingProjectProblem.php

@@ -3,15 +3,14 @@
 namespace App\Models\CrowdSourcingProject\Problem;
 
 use Awobaz\Compoships\Compoships;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 class CrowdSourcingProjectProblem extends Model {
     use Compoships;
-    use HasFactory, SoftDeletes;
+    use SoftDeletes;
 
     protected $table = 'crowd_sourcing_project_problems';
     protected $fillable = ['id', 'project_id', 'slug', 'status_id', 'img_url', 'default_language_id'];
@@ -22,6 +21,6 @@ public function defaultTranslation(): HasOne {
     }
 
     public function translations(): HasMany {
-        return $this->hasMany(CrowdSourcingProjectProblemTranslation::class, 'project_id', 'id');
+        return $this->hasMany(CrowdSourcingProjectProblemTranslation::class, 'problem_id', 'id');
     }
 }

app/Models/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemTranslation.php

@@ -5,12 +5,10 @@
 use App\Models\CompositeKeysModel;
 use App\Models\Language;
 use Awobaz\Compoships\Compoships;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class CrowdSourcingProjectProblemTranslation extends CompositeKeysModel {
     use Compoships;
-    use HasFactory;
 
     protected $table = 'crowd_sourcing_project_problem_translations';
     protected $fillable = ['problem_id', 'language_id', 'title', 'description'];

app/Repository/CrowdSourcingProject/Problem/CrowdSourcingProjectProblemRepository.php

@@ -2,6 +2,7 @@
 
 namespace App\Repository\CrowdSourcingProject\Problem;
 
+use App\BusinessLogicLayer\lkp\CrowdSourcingProjectProblemStatusLkp;
 use App\Models\CrowdSourcingProject\CrowdSourcingProject;
 use App\Models\CrowdSourcingProject\Problem\CrowdSourcingProjectProblem;
 use App\Repository\Repository;
@@ -17,4 +18,13 @@ public function getModelClassName() {
     public function getProjectWithProblemsByProjectSlug(string $project_slug): CrowdSourcingProject {
         return CrowdSourcingProject::where('slug', $project_slug)->with(['problems'])->first();
     }
+
+    public function projectHasPublishedProblems(int $project_id): bool {
+        $hasPublishedProblemsWithTranslations = CrowdSourcingProjectProblem::where('project_id', $project_id)
+            ->where('status_id', CrowdSourcingProjectProblemStatusLkp::PUBLISHED)
+            ->whereHas('translations')
+            ->exists();
+
+        return $hasPublishedProblemsWithTranslations;
+    }
 }

app/ViewModels/CrowdSourcingProject/CrowdSourcingProjectForLandingPage.php

@@ -9,6 +9,7 @@ class CrowdSourcingProjectForLandingPage {
     public $project;
     public $questionnaire;
     public $feedbackQuestionnaire;
+    public $projectHasPublishedProblems;
     public $userResponse;
     public $userFeedbackQuestionnaireResponse;
     public $totalResponses;
@@ -24,6 +25,7 @@ public function __construct(
         $project,
         $questionnaire,
         $feedbackQuestionnaire,
+        $projectHasPublishedProblems,
         $userResponse,
         $userFeedbackQuestionnaireResponse,
         $totalResponses,
@@ -35,6 +37,7 @@ public function __construct(
         $this->project = $project;
         $this->questionnaire = $questionnaire;
         $this->feedbackQuestionnaire = $feedbackQuestionnaire;
+        $this->projectHasPublishedProblems = $projectHasPublishedProblems;
         $this->userResponse = $userResponse;
         $this->userFeedbackQuestionnaireResponse = $userFeedbackQuestionnaireResponse;
         $this->totalResponses = $totalResponses;

resources/lang/bg/project-problems.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'back' => 'Назад',
+    'the_topic' => 'Темата:',
+    'list_of_problems' => 'Списък с проблеми',
+    'see_all_problems' => 'Виж всички проблеми',
+    'solutions_for' => 'Решения за',
+    'project_landing_page_problems_action_button' => 'Виж всички проблеми',
+];

resources/lang/de/project-problems.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'back' => 'Zurück',
+    'the_topic' => 'Das Thema:',
+    'list_of_problems' => 'Liste der Probleme',
+    'see_all_problems' => 'Alle Probleme anzeigen',
+    'solutions_for' => 'Lösungen für',
+    'project_landing_page_problems_action_button' => 'Alle Probleme anzeigen',
+];

resources/lang/el/project-problems.php

@@ -6,4 +6,5 @@
     'list_of_problems' => 'Λίστα Προβλημάτων',
     'see_all_problems' => 'Δες όλα τα προβλήματα',
     'solutions_for' => 'Λύσεις για',
+    'project_landing_page_problems_action_button' => 'Δες όλα τα προβλήματα',
 ];

resources/lang/en/project-problems.php

@@ -6,4 +6,5 @@
     'list_of_problems' => 'List of Problems',
     'see_all_problems' => 'See all problems',
     'solutions_for' => 'Solutions for',
+    'project_landing_page_problems_action_button' => 'See all problems',
 ];

resources/lang/es/project-problems.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'back' => 'Atrás',
+    'the_topic' => 'El tema:',
+    'list_of_problems' => 'Lista de problemas',
+    'see_all_problems' => 'Ver todos los problemas',
+    'solutions_for' => 'Soluciones para',
+    'project_landing_page_problems_action_button' => 'Ver todos los problemas',
+];

resources/lang/et/project-problems.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'back' => 'Tagasi',
+    'the_topic' => 'Teema:',
+    'list_of_problems' => 'Probleemide loetelu',
+    'see_all_problems' => 'Vaata kõiki probleeme',
+    'solutions_for' => 'Lahendused',
+    'project_landing_page_problems_action_button' => 'Vaata kõiki probleeme',
+];

resources/lang/fr/project-problems.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'back' => 'Retour',
+    'the_topic' => 'Le sujet:',
+    'list_of_problems' => 'Liste des problèmes',
+    'see_all_problems' => 'Voir tous les problèmes',
+    'solutions_for' => 'Solutions pour',
+    'project_landing_page_problems_action_button' => 'Voir tous les problèmes',
+];

resources/lang/hu/project-problems.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'back' => 'Vissza',
+    'the_topic' => 'A téma:',
+    'list_of_problems' => 'Problémák listája',
+    'see_all_problems' => 'Összes probléma megtekintése',
+    'solutions_for' => 'Megoldások',
+    'project_landing_page_problems_action_button' => 'Összes probléma megtekintése',
+];

resources/lang/it/project-problems.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'back' => 'Indietro',
+    'the_topic' => 'L\'argomento:',
+    'list_of_problems' => 'Elenco dei problemi',
+    'see_all_problems' => 'Vedi tutti i problemi',
+    'solutions_for' => 'Soluzioni per',
+    'project_landing_page_problems_action_button' => 'Vedi tutti i problemi',
+];

resources/lang/lv/project-problems.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'back' => 'Atpakaļ',
+    'the_topic' => 'Tēma:',
+    'list_of_problems' => 'Problēmu saraksts',
+    'see_all_problems' => 'Skatīt visas problēmas',
+    'solutions_for' => 'Risinājumi',
+    'project_landing_page_problems_action_button' => 'Skatīt visas problēmas',
+];

resources/lang/nl/project-problems.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'back' => 'Terug',
+    'the_topic' => 'Het onderwerp:',
+    'list_of_problems' => 'Lijst met problemen',
+    'see_all_problems' => 'Bekijk alle problemen',
+    'solutions_for' => 'Oplossingen voor',
+    'project_landing_page_problems_action_button' => 'Bekijk alle problemen',
+];

resources/lang/pt/project-problems.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'back' => 'Voltar',
+    'the_topic' => 'O tópico:',
+    'list_of_problems' => 'Lista de problemas',
+    'see_all_problems' => 'Ver todos os problemas',
+    'solutions_for' => 'Soluções para',
+    'project_landing_page_problems_action_button' => 'Ver todos os problemas',
+];

resources/lang/sk/project-problems.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'back' => 'Späť',
+    'the_topic' => 'Téma:',
+    'list_of_problems' => 'Zoznam problémov',
+    'see_all_problems' => 'Zobraziť všetky problémy',
+    'solutions_for' => 'Riešenia pre',
+    'project_landing_page_problems_action_button' => 'Zobraziť všetky problémy',
+];

resources/lang/sr/project-problems.php

@@ -0,0 +1,10 @@
+<?php
+
+return [
+    'back' => 'Nazad',
+    'the_topic' => 'Tema:',
+    'list_of_problems' => 'Lista problema',
+    'see_all_problems' => 'Pogledaj sve probleme',
+    'solutions_for' => 'Rešenja za',
+    'project_landing_page_problems_action_button' => 'Pogledaj sve probleme',
+];

resources/views/crowdsourcing-project/partials/motto.blade.php

@@ -94,8 +94,12 @@ class="btn btn-primary w-100 respond-questionnaire call-to-action
                                         </a>
                                     </div>
                                 @endif
+                            @elseif($viewModel->projectHasPublishedProblems)
+                                <a href="{{ route('project.problems-page', ['project_slug' => $viewModel->project->slug]) }}"
+                                   class="btn btn-primary w-100 call-to-action">
+                                    {{__("project-problems.project_landing_page_problems_action_button")}} <i
+                                            class="fas fa-arrow-right"></i></a>
                             @else
-                                {{-- PROJECT DOES NOT HAVE AN ACTIVE QUESTIONNAIRE --}}
                                 @include('crowdsourcing-project.partials.external-url')
                             @endif
                         </div>