ali 3 år sedan
förälder
incheckning
4b9a65af08

+ 0 - 1
src/components/Widgets/SessionAttendanceSheet/AdminSessionAttendanceSheetList/AdminSessionAttendanceSheetList.vue

@@ -41,7 +41,6 @@
 
 <script>
 import { EntityIndex } from 'quasar-crud'
-import { Ticket } from 'src/models/Ticket.js'
 import { mixinWidget } from 'src/mixin/Mixins.js'
 import { APIGateway } from 'src/api/APIGateway.js'
 import { Classroom } from 'src/models/Classroom.js'

+ 95 - 15
src/components/Widgets/Ticket/AdminTicketShow/AdminTicketShow.vue

@@ -69,6 +69,7 @@
                                 :key="message.id"
                                 :avatar="message.creator_info.picture ? message.creator_info.picture : 'assets/images/web/sample-avatar.svg'"
                                 :name="message.creator_info.firstname + ' ' + message.creator_info.lastname"
+                                text-html
                                 :text="[message.body]"
                                 :sent="!isUserMessage(authenticatedUser, message)">
                   <template v-slot:stamp>
@@ -85,22 +86,101 @@
                             :name="message.read ? 'done_all' : 'done'" />
                   </template>
                 </q-chat-message>
-                <div>
-                  <q-input v-model="replyText"
-                           bottom-slots
-                           autogrow
-                           :loading="entityLoading">
-                    <template v-slot:after>
-                      <q-btn round
-                             dense
-                             flat
-                             icon="send"
-                             :loading="entityLoading"
-                             @click="sendReply" />
-                    </template>
-                  </q-input>
+                <div class="row">
+                  <div class="col-md-10 col-sm-9 col-12">
+                    <q-editor v-model="replyText"
+                              :toolbar="[
+                                [
+                                  {
+                                    label: $q.lang.editor.align,
+                                    icon: $q.iconSet.editor.align,
+                                    fixedLabel: true,
+                                    list: 'only-icons',
+                                    options: ['left', 'center', 'right', 'justify']
+                                  }
+                                ],
+                                ['bold', 'italic', 'strike', 'underline', 'subscript', 'superscript'],
+                                ['token', 'hr', 'link', 'custom_btn'],
+                                ['print', 'fullscreen'],
+                                [
+                                  {
+                                    label: $q.lang.editor.formatting,
+                                    icon: $q.iconSet.editor.formatting,
+                                    list: 'no-icons',
+                                    options: [
+                                      'p',
+                                      'h1',
+                                      'h2',
+                                      'h3',
+                                      'h4',
+                                      'h5',
+                                      'h6',
+                                      'code'
+                                    ]
+                                  },
+                                  {
+                                    label: $q.lang.editor.fontSize,
+                                    icon: $q.iconSet.editor.fontSize,
+                                    fixedLabel: true,
+                                    fixedIcon: true,
+                                    list: 'no-icons',
+                                    options: [
+                                      'size-1',
+                                      'size-2',
+                                      'size-3',
+                                      'size-4',
+                                      'size-5',
+                                      'size-6',
+                                      'size-7'
+                                    ]
+                                  },
+                                  {
+                                    label: $q.lang.editor.defaultFont,
+                                    icon: $q.iconSet.editor.font,
+                                    fixedIcon: true,
+                                    list: 'no-icons',
+                                    options: [
+                                      'default_font',
+                                      'arial',
+                                      'arial_black',
+                                      'comic_sans',
+                                      'courier_new',
+                                      'impact',
+                                      'lucida_grande',
+                                      'times_new_roman',
+                                      'verdana'
+                                    ]
+                                  },
+                                  'removeFormat'
+                                ],
+                                ['quote', 'unordered', 'ordered', 'outdent', 'indent'],
+
+                                ['undo', 'redo'],
+                                ['viewsource']
+                              ]"
+                              :fonts="{
+                                arial: 'Arial',
+                                arial_black: 'Arial Black',
+                                comic_sans: 'Comic Sans MS',
+                                courier_new: 'Courier New',
+                                impact: 'Impact',
+                                lucida_grande: 'Lucida Grande',
+                                times_new_roman: 'Times New Roman',
+                                verdana: 'Verdana'
+                              }"
+                              min-height="5rem" />
+                  </div>
+                  <div class="col-md-2 col-sm-3 col-12 flex justify-center items-center">
+                    <q-btn round
+                           dense
+                           flat
+                           icon="send"
+                           label="ارسال پاسخ"
+                           :loading="entityLoading"
+                           @click="sendReply" />
+                  </div>
                 </div>
-                <div>
+                <div class="q-mt-md">
                   <q-btn outline
                          color="red"
                          @click="closeTicket">

+ 0 - 1
src/components/Widgets/Transaction/TransactionList/PaymentList.vue

@@ -51,7 +51,6 @@ import { shallowRef } from 'vue'
 import Assist from 'assets/js/Assist.js'
 import { EntityIndex } from 'quasar-crud'
 import { Payment } from 'src/models/Payment.js'
-import { Invoice } from 'src/models/Invoice.js'
 import { mixinWidget } from 'src/mixin/Mixins.js'
 import { APIGateway } from 'src/api/APIGateway.js'
 import { FormBuilderAssist } from 'quasar-form-builder'

+ 7 - 7
src/css/app.scss

@@ -1,12 +1,12 @@
 @import 'src/css/Theme/theme.scss';
 
-* {
-  user-select: none; /* supported by Chrome and Opera */
-  -webkit-user-select: none; /* Safari */
-  -khtml-user-select: none; /* Konqueror HTML */
-  -moz-user-select: none; /* Firefox */
-  -ms-user-select: none; /* Internet Explorer/Edge */
-}
+//* {
+//  user-select: none; /* supported by Chrome and Opera */
+//  -webkit-user-select: none; /* Safari */
+//  -khtml-user-select: none; /* Konqueror HTML */
+//  -moz-user-select: none; /* Firefox */
+//  -ms-user-select: none; /* Internet Explorer/Edge */
+//}
 
 a {
   text-decoration: none;