Skip to content

Commit

Permalink
Merge pull request #75 from scify/project_lp_cta
Browse files Browse the repository at this point in the history 
Fixed questionnaire creation
  • Loading branch information
@PavlosIsaris
PavlosIsaris authored Oct 4, 2024
2 parents 5ea5b87 + 3213d00 commit 8027547
Show file tree
Hide file tree
Showing 11 changed files with 62 additions and 64 deletions.
2 changes: 1 addition & 1 deletion .env.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ APP_KEY=
APP_DEBUG=true
DEBUGBAR_ENABLED=false
APP_LOG_LEVEL=debug
APP_URL=http://localhost
APP_URL=http://localhost:8000
APP_VERSION=v5.0
GOOGLE_MAPS_KEY=

Expand Down
20 changes: 12 additions & 8 deletions app/Http/Controllers/Questionnaire/QuestionnaireController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ class QuestionnaireController extends Controller {
protected QuestionnaireTranslator $questionnaireTranslator;
protected QuestionnaireLanguageManager $questionnaireLanguageManager;

public function __construct(QuestionnaireManager $questionnaireManager,
UserQuestionnaireShareManager $questionnaireShareManager,
QuestionnaireVMProvider $questionnaireVMProvider,
QuestionnaireTranslator $questionnaireTranslator,
QuestionnaireLanguageManager $questionnaireLanguageManager) {
public function __construct(QuestionnaireManager $questionnaireManager,
UserQuestionnaireShareManager $questionnaireShareManager,
QuestionnaireVMProvider $questionnaireVMProvider,
QuestionnaireTranslator $questionnaireTranslator,
QuestionnaireLanguageManager $questionnaireLanguageManager) {
$this->questionnaireManager = $questionnaireManager;
$this->questionnaireShareManager = $questionnaireShareManager;
$this->questionnaireVMProvider = $questionnaireVMProvider;
Expand Down Expand Up @@ -60,18 +60,22 @@ public function createQuestionnaire() {

public function store(Request $request) {
$data = $request->all();
if (!isset($data['status_id']))
$data['status_id'] = QuestionnaireStatusLkp::DRAFT;

$this->validate($request, [
'type_id' => 'required|integer',
'language' => 'required',
'statistics_page_visibility_lkp_id' => 'required',
'goal' => 'required|integer',
'lang_codes' => 'required|array',
'lang_codes' => 'array',
'content' => 'required',
'status_id' => 'required|integer|in:' . implode(',', QuestionnaireStatusLkp::GetAllStatusIds()),
'status_id' => 'integer|in:' . implode(',', QuestionnaireStatusLkp::GetAllStatusIds()),
'project_ids' => 'required|array',
]);
$questionnaire = $this->questionnaireManager->storeOrUpdateQuestionnaire($data);
$this->questionnaireLanguageManager->saveLanguagesForQuestionnaire($data['lang_codes'], $questionnaire->id);
if (isset($data['lang_codes']) && count($data['lang_codes']) > 0)
$this->questionnaireLanguageManager->saveLanguagesForQuestionnaire($data['lang_codes'], $questionnaire->id);

return $questionnaire;
}
Expand Down
1 change: 0 additions & 1 deletion config/app.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
*/

'url' => env('APP_URL', 'http://localhost'),
'mix_url' => env('VITE_ASSET_URL', null),
/*
|--------------------------------------------------------------------------
| Application Timezone
Expand Down
49 changes: 24 additions & 25 deletions resources/assets/js/vue-components/common/TranslationsManager.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@

<div
v-for="language in availableLanguages"
v-if="language?.id !== defaultLangId"
:key="'avail_lang_' + language.id"
class="float-left mr-2 lang"
>
<label>
<label v-if="language?.id !== defaultLangId">
<input
v-model="checkedLanguages"
type="checkbox"
Expand Down Expand Up @@ -64,31 +63,31 @@
>
<table class="table table-striped">
<thead>
<tr>
<th scope="col">Field</th>
<th scope="col">Original Language ({{ getLanguageName(defaultLangId) }})</th>
<th scope="col">
Translation in
{{ getLanguageName(translation.language_id) }}
</th>
</tr>
<tr>
<th scope="col">Field</th>
<th scope="col">Original Language ({{ getLanguageName(defaultLangId) }})</th>
<th scope="col">
Translation in
{{ getLanguageName(translation.language_id) }}
</th>
</tr>
</thead>
<tbody>
<tr
v-for="(value, property) in translation"
v-if="modelMetaData[property]"
:key="'translation_row_' + property"
>
<td class="field">
{{ getDisplayTitleForProperty(property) }}
</td>
<td class="original-translation">
{{ originalTranslation[property] }}
</td>
<td>
<textarea v-model="translation[property]"></textarea>
</td>
</tr>
<tr
v-for="(value, property) in translation"
v-if="modelMetaData[property]"
:key="'translation_row_' + property"
>
<td class="field">
{{ getDisplayTitleForProperty(property) }}
</td>
<td class="original-translation">
{{ originalTranslation[property] }}
</td>
<td>
<textarea v-model="translation[property]"></textarea>
</td>
</tr>
</tbody>
</table>
</div>
Expand Down
1 change: 1 addition & 0 deletions resources/assets/js/vue-components/questionnaire/QuestionnaireCreateEdit.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,7 @@ export default defineComponent({
},
async saveQuestionnaire() {
let locales = this.surveyCreator.translationValue.getSelectedLocales();
console.log(locales);
if (locales[0] === "") {
locales = [];
}
Expand Down
7 changes: 7 additions & 0 deletions resources/assets/sass/common.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -507,3 +507,10 @@ a.link {
cursor: pointer;
}
}

.nav-item {
.user-image {
height: 35px;
margin-right: 5px;
}
}
9 changes: 4 additions & 5 deletions resources/views/crowdsourcing-project/partials/motto.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,10 @@ class="btn btn-primary btn-lg w-100 dashboard-btn">
{{-- IF HE HAS NOT RESPONDEDED TO THE FEEDBACK, INVITE HIM TO DO SO--}}
@if ($viewModel->displayFeedbackQuestionnaire())
<div class="col-md-9 col-sm-12 mx-auto mt-5">
@include("crowdsourcing-project.partials.open-feedback-questionnaire-button",
[
"css_class"=> "btn btn-primary w-100 call-to-action ",
"label"=> __("questionnaire.give_us_feedback")
])
<a href="{{ route('show-questionnaire-page', ['project' => $viewModel->project->slug,'questionnaire' => $viewModel->feedbackQuestionnaire->id]) }}"
class="btn btn-primary w-100 respond-questionnaire call-to-action">
{{__("questionnaire.give_us_feedback")}}
</a>
</div>
@else
<div class="col-lg-7 col-md-9 col-sm-12 mx-auto ">
Expand Down
23 changes: 10 additions & 13 deletions resources/views/crowdsourcing-project/partials/navbar.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,15 @@
<span class="navbar-toggler-icon"></span>
</button>

@if(isset($viewModel->project))
<div class="collapse navbar-collapse pull-right" id="top-menu-content">
<ul class="nav navbar"
<div class=" collapse navbar-collapse pull-right
" id="top-menu-content">
<ul class="nav navbar-nav ml-auto">
@if(!isset($onErrorPage))
@include("partials.login-menu-options")
@endif
@include('partials.content-languages', ['languages' => $viewModel->project->languages])
</ul>
</div>
@endif
<div class="collapse navbar-collapse pull-right" id="top-menu-content">
<ul class="nav navbar-nav ml-auto">
@if(!isset($onErrorPage))
@include("partials.login-menu-options")
@endif
@if(isset($viewModel->project))
@include('partials.content-languages', ['languages' => $viewModel->project->languages])
@endif
</ul>
</div>
</nav>
</div>
2 changes: 1 addition & 1 deletion resources/views/loggedin-environment/partials/header-controls.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</li>
@endif
<li class="nav-item dropdown user user-menu">
<a class="nav-link" href="#" class="dropdown-toggle" data-toggle="dropdown">
<a class="nav-link py-0" href="#" class="dropdown-toggle" data-toggle="dropdown">
@if (Auth::user()->avatar)
<img loading="lazy" src="{{ Auth::user()->avatar}}" class="user-image">
@endif
Expand Down
4 changes: 2 additions & 2 deletions resources/views/partials/login-menu-options.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
</li>

<li class="nav-item dropdown user user-menu">
<a class="nav-link" href="#" class="dropdown-toggle" data-toggle="dropdown">
<a class="nav-link py-0" href="#" class="dropdown-toggle" data-toggle="dropdown">
@if (Auth::user()->avatar)
<img loading="lazy" src="{{ Auth::user()->avatar}}" class="user-image">
<img loading="lazy" src="{{ Auth::user()->avatar}}" class="user-image" alt="User Image">
@endif
<span class="hidden-xs">{{Auth::user()->nickname}}</span>
<i class="fas fa-caret-down"></i>
Expand Down
8 changes: 0 additions & 8 deletions vite.config.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,6 @@ import vue from "@vitejs/plugin-vue";
import path from "path";

export default defineConfig({
// declaring the base path for the project
server: {
port: 3000,
hmr: {
host: "localhost",
protocol: "ws",
},
},
plugins: [
laravel({
input: [
Expand Down

0 comments on commit 8027547

Please sign in to comment.