From da21a895096c1f4e0fdc7962dbec30cd46575da2 Mon Sep 17 00:00:00 2001
From: Woraprat <73052317+aeworaprat@users.noreply.github.com>
Date: Fri, 10 Mar 2023 04:37:21 +0700
Subject: [PATCH] update project
---
.../views/general/v_general_select.php | 8 +--
.../views/project/v_project_create.php | 39 ++++++--------
.../views/project/v_project_create_user.php | 39 ++++++--------
.../views/project/v_project_edit.php | 53 ++++++-------------
.../views/project/v_project_edit_user.php | 52 ++++++------------
5 files changed, 66 insertions(+), 125 deletions(-)
diff --git a/html/exhi/application/views/general/v_general_select.php b/html/exhi/application/views/general/v_general_select.php
index 9832782..e515d4a 100644
--- a/html/exhi/application/views/general/v_general_select.php
+++ b/html/exhi/application/views/general/v_general_select.php
@@ -199,7 +199,7 @@ span{
<div class="card-body " style='padding: 20px; margin-left: 5px;'>
<div class="row">
<div class="col-6">
- <?php echo $d->description ?>
+ <span style="font-family: Sarabun; font-size: 18px;"><?php echo $d->description ?></span>
</div>
<div class="col-6">
<div class="row">
@@ -240,7 +240,7 @@ span{
</div>
</div>
<div class="col-6">
- <?php echo $d->description ?>
+ <span style="font-family: Sarabun; font-size: 18px;"><?php echo $d->description ?></span>
</div>
</div>
</div>
@@ -260,7 +260,7 @@ span{
</div>
</div>
<div class="col-12">
- <?php echo $d->description ?>
+ <span style="font-family: Sarabun; font-size: 18px;"><?php echo $d->description ?></span>
</div>
</div>
<?php } ?>
@@ -268,7 +268,7 @@ span{
<div class="card-body" style='padding: 20px; margin-left: 5px; text-align: justify;'>
<div class="row">
<div class="col-12">
- <?php echo $d->description ?>
+ <span style="font-family: Sarabun; font-size: 18px;"><?php echo $d->description ?></span>
</div>
<div class="col-6">
<a href="<?php echo base_url().$d->image1 ?>" data-toggle="lightbox" data-gallery="example-gallery">
diff --git a/html/exhi/application/views/project/v_project_create.php b/html/exhi/application/views/project/v_project_create.php
index 8e44d6a..f60ff17 100644
--- a/html/exhi/application/views/project/v_project_create.php
+++ b/html/exhi/application/views/project/v_project_create.php
@@ -66,11 +66,8 @@ label{
.filepond--root .filepond--drop-label {
height: auto;
}
-.note-editable {
- font-family: 'Sarabun', sans-serif;
- text-align: left !important;
- height: 350px !important;
-
+textarea {
+ height: 150px !important;
}
</style>
<div class="content-wrapper h-100">
@@ -306,7 +303,9 @@ label{
<button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button><br><br>
<div class='row'>
<div class='col-md-6'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
<div class='col-md-6'>
<input type="file" class="filepond" name="filepond1" accept="image/png, image/jpeg"/>
@@ -326,7 +325,9 @@ label{
<input type="file" class="filepond" name="filepond2" accept="image/png, image/jpeg"/>
</div>
<div class='col-md-6'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
</div>
</div>
@@ -338,7 +339,9 @@ label{
<button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button><br><br>
<div class='row'>
<div class='col-md-12'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
</div>
<br>
@@ -367,7 +370,9 @@ label{
</div>
<div class='row'>
<div class='col-md-12'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
</div>
</div>
@@ -583,19 +588,6 @@ function chose_template(){
});
data_result.push(obj)
index++
- $('.summernote').summernote({
- height: 300,
- fontNames: ['Sarabun','sans-serif'],
- fontNamesIgnoreCheck: ['Sarabun','sans-serif'],
- toolbar: [
- ['style', ['bold', 'italic']],
- ['color', ['color']],
- ['para', ['ul', 'ol', 'paragraph']],
- ['fontsize', ['fontsize']],
- ['fontname', ['fontname']],
- ],
- fontSizes: ['8','9','10','11','12','14','16','18','20','22','24', '36', '48' , '64', '82', '150']
- });
$('#modal_detail').modal('hide')
}
}
@@ -707,8 +699,9 @@ function insert_projecct(){
let select
let select_text
for(data of data_result){
- data.textarea = $(`#${data.textarea_id}`).summernote('code')
+ data.textarea = $(`#${data.textarea_id}`).val()
}
+ console.log(data_result)
let detail = data_result
let member = data_member
let image_logo = data_circle
diff --git a/html/exhi/application/views/project/v_project_create_user.php b/html/exhi/application/views/project/v_project_create_user.php
index 537c5a9..53b5d7a 100644
--- a/html/exhi/application/views/project/v_project_create_user.php
+++ b/html/exhi/application/views/project/v_project_create_user.php
@@ -66,12 +66,8 @@ label{
.filepond--root .filepond--drop-label {
height: auto;
}
-.note-editable {
- font-family: 'Sarabun', sans-serif;
- font-size: 16px !important;
- text-align: left !important;
- height: 350px !important;
-
+textarea {
+ height: 150px !important;
}
</style>
<div class="content-wrapper h-100">
@@ -307,7 +303,9 @@ label{
<button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button><br><br>
<div class='row'>
<div class='col-md-6'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
<div class='col-md-6'>
<input type="file" class="filepond" name="filepond1" accept="image/png, image/jpeg"/>
@@ -327,7 +325,9 @@ label{
<input type="file" class="filepond" name="filepond2" accept="image/png, image/jpeg"/>
</div>
<div class='col-md-6'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
</div>
</div>
@@ -339,7 +339,9 @@ label{
<button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button><br><br>
<div class='row'>
<div class='col-md-12'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
</div>
<br>
@@ -368,7 +370,9 @@ label{
</div>
<div class='row'>
<div class='col-md-12'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
</div>
</div>
@@ -584,19 +588,6 @@ function chose_template(){
});
data_result.push(obj)
index++
- $('.summernote').summernote({
- height: 300,
- fontNames: ['Sarabun','sans-serif'],
- fontNamesIgnoreCheck: ['Sarabun','sans-serif'],
- toolbar: [
- ['style', ['bold', 'italic']],
- ['color', ['color']],
- ['para', ['ul', 'ol', 'paragraph']],
- ['fontsize', ['fontsize']],
- ['fontname', ['fontname']],
- ],
- fontSizes: ['8','9','10','11','12','14','16','18','20','22','24', '36', '48' , '64', '82', '150']
- });
$('#modal_detail').modal('hide')
}
}
@@ -708,7 +699,7 @@ function insert_projecct(){
let select
let select_text
for(data of data_result){
- data.textarea = $(`#${data.textarea_id}`).summernote('code')
+ data.textarea = $(`#${data.textarea_id}`).val()
}
let detail = data_result
let member = data_member
diff --git a/html/exhi/application/views/project/v_project_edit.php b/html/exhi/application/views/project/v_project_edit.php
index de2cd6a..936c3dd 100644
--- a/html/exhi/application/views/project/v_project_edit.php
+++ b/html/exhi/application/views/project/v_project_edit.php
@@ -68,11 +68,8 @@ label{
display: inline;
/* font-weight: bold; */
}
-.note-editable {
- font-family: 'Sarabun', sans-serif;
- text-align: left !important;
- height: 350px !important;
-
+textarea {
+ height: 150px !important;
}
</style>
<div class="content-wrapper h-100">
@@ -309,7 +306,9 @@ label{
<button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button><br><br>
<div class='row'>
<div class='col-md-6'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
<div class='col-md-6'>
<input type="file" class="filepond" name="filepond1" accept="image/png, image/jpeg"/>
@@ -329,7 +328,9 @@ label{
<input type="file" class="filepond" name="filepond2" accept="image/png, image/jpeg"/>
</div>
<div class='col-md-6'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
</div>
</div>
@@ -341,7 +342,9 @@ label{
<button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button><br><br>
<div class='row'>
<div class='col-md-12'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
</div>
<br>
@@ -370,7 +373,9 @@ label{
</div>
<div class='row'>
<div class='col-md-12'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
</div>
</div>
@@ -560,20 +565,6 @@ function set_detail(details){
});
data_result.push(obj)
index++
-
- $('.summernote').summernote({
- height: 300,
- fontNames: ['Sarabun','sans-serif'],
- fontNamesIgnoreCheck: ['Sarabun','sans-serif'],
- toolbar: [
- ['style', ['bold', 'italic']],
- ['color', ['color']],
- ['para', ['ul', 'ol', 'paragraph']],
- ['fontsize', ['fontsize']],
- ['fontname', ['fontname']],
- ],
- fontSizes: ['8','9','10','11','12','14','16','18','20','22','24', '36', '48' , '64', '82', '150']
- });
$('#modal_detail').modal('hide')
}
}
@@ -759,19 +750,6 @@ function chose_template(){
});
data_result.push(obj)
index++
- $('.summernote').summernote({
- height: 300,
- fontNames: ['Sarabun','sans-serif'],
- fontNamesIgnoreCheck: ['Sarabun','sans-serif'],
- toolbar: [
- ['style', ['bold', 'italic']],
- ['color', ['color']],
- ['para', ['ul', 'ol', 'paragraph']],
- ['fontsize', ['fontsize']],
- ['fontname', ['fontname']],
- ],
- fontSizes: ['8','9','10','11','12','14','16','18','20','22','24', '36', '48' , '64', '82', '150']
- });
$('#modal_detail').modal('hide')
}
}
@@ -890,8 +868,9 @@ function update_projecct(){
let select
let select_text
for(data of data_result){
- data.textarea = $(`#${data.textarea_id}`).summernote('code')
+ data.textarea = $(`#${data.textarea_id}`).val()
}
+ console.log(data)
let detail = data_result
let member = data_member
let image_logo = data_circle
diff --git a/html/exhi/application/views/project/v_project_edit_user.php b/html/exhi/application/views/project/v_project_edit_user.php
index d099b48..725ce6b 100644
--- a/html/exhi/application/views/project/v_project_edit_user.php
+++ b/html/exhi/application/views/project/v_project_edit_user.php
@@ -68,11 +68,8 @@ label{
display: inline;
/* font-weight: bold; */
}
-.note-editable {
- font-family: 'Sarabun', sans-serif;
- text-align: left !important;
- height: 350px !important;
-
+textarea {
+ height: 150px !important;
}
</style>
<div class="content-wrapper h-100">
@@ -309,7 +306,9 @@ label{
<button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button><br><br>
<div class='row'>
<div class='col-md-6'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
<div class='col-md-6'>
<input type="file" class="filepond" name="filepond1" accept="image/png, image/jpeg"/>
@@ -329,7 +328,9 @@ label{
<input type="file" class="filepond" name="filepond2" accept="image/png, image/jpeg"/>
</div>
<div class='col-md-6'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
</div>
</div>
@@ -341,7 +342,9 @@ label{
<button type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button><br><br>
<div class='row'>
<div class='col-md-12'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
</div>
<br>
@@ -370,7 +373,9 @@ label{
</div>
<div class='row'>
<div class='col-md-12'>
- <textarea class="summernote"></textarea>
+ <div class="form-group">
+ <textarea class="form-control summernote" row="6"></textarea>
+ </div>
</div>
</div>
</div>
@@ -560,20 +565,6 @@ function set_detail(details){
});
data_result.push(obj)
index++
-
- $('.summernote').summernote({
- height: 300,
- fontNames: ['Sarabun','sans-serif'],
- fontNamesIgnoreCheck: ['Sarabun','sans-serif'],
- toolbar: [
- ['style', ['bold', 'italic']],
- ['color', ['color']],
- ['para', ['ul', 'ol', 'paragraph']],
- ['fontsize', ['fontsize']],
- ['fontname', ['fontname']],
- ],
- fontSizes: ['8','9','10','11','12','14','16','18','20','22','24', '36', '48' , '64', '82', '150']
- });
$('#modal_detail').modal('hide')
}
}
@@ -759,19 +750,6 @@ function chose_template(){
});
data_result.push(obj)
index++
- $('.summernote').summernote({
- height: 300,
- fontNames: ['Sarabun','sans-serif'],
- fontNamesIgnoreCheck: ['Sarabun','sans-serif'],
- toolbar: [
- ['style', ['bold', 'italic']],
- ['color', ['color']],
- ['para', ['ul', 'ol', 'paragraph']],
- ['fontsize', ['fontsize']],
- ['fontname', ['fontname']],
- ],
- fontSizes: ['8','9','10','11','12','14','16','18','20','22','24', '36', '48' , '64', '82', '150']
- });
$('#modal_detail').modal('hide')
}
}
@@ -890,7 +868,7 @@ function update_projecct(){
let select
let select_text
for(data of data_result){
- data.textarea = $(`#${data.textarea_id}`).summernote('code')
+ data.textarea = $(`#${data.textarea_id}`).val()
}
let detail = data_result
let member = data_member
--
GitLab