Revize b51488cd

Annotation finishing implemented

webapp/api/api.ts

@@ -699 +699 @@
      */
     'role'?: ERole;
 }
+/**
+ * 
+ * @export
+ * @interface MarkAnnotationDoneRequest
+ */
+export interface MarkAnnotationDoneRequest {
+    /**
+     * 
+     * @type {boolean}
+     * @memberof MarkAnnotationDoneRequest
+     */
+    'done'?: boolean;
+}
 /**
  * 
  * @export
@@ -1167 +1180 @@
  */
 export const AnnotationApiAxiosParamCreator = function (configuration?: Configuration) {
     return {
+        /**
+         * 
+         * @param {string} annotationId 
+         * @param {MarkAnnotationDoneRequest} [markAnnotationDoneRequest] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        annotationAnnotationIdDonePut: async (annotationId: string, markAnnotationDoneRequest?: MarkAnnotationDoneRequest, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'annotationId' is not null or undefined
+            assertParamExists('annotationAnnotationIdDonePut', 'annotationId', annotationId)
+            const localVarPath = `/annotation/{annotationId}/done`
+                .replace(`{${"annotationId"}}`, encodeURIComponent(String(annotationId)));
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'PUT', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            localVarHeaderParameter['Content-Type'] = 'application/json';
+
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+            localVarRequestOptions.data = serializeDataIfNeeded(markAnnotationDoneRequest, localVarRequestOptions, configuration)
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @param {string} annotationId 
@@ -1436 +1486 @@
 export const AnnotationApiFp = function(configuration?: Configuration) {
     const localVarAxiosParamCreator = AnnotationApiAxiosParamCreator(configuration)
     return {
+        /**
+         * 
+         * @param {string} annotationId 
+         * @param {MarkAnnotationDoneRequest} [markAnnotationDoneRequest] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async annotationAnnotationIdDonePut(annotationId: string, markAnnotationDoneRequest?: MarkAnnotationDoneRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.annotationAnnotationIdDonePut(annotationId, markAnnotationDoneRequest, options);
+            return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
+        },
         /**
          * 
          * @param {string} annotationId 
@@ -1523 +1584 @@
 export const AnnotationApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
     const localVarFp = AnnotationApiFp(configuration)
     return {
+        /**
+         * 
+         * @param {string} annotationId 
+         * @param {MarkAnnotationDoneRequest} [markAnnotationDoneRequest] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        annotationAnnotationIdDonePut(annotationId: string, markAnnotationDoneRequest?: MarkAnnotationDoneRequest, options?: any): AxiosPromise<void> {
+            return localVarFp.annotationAnnotationIdDonePut(annotationId, markAnnotationDoneRequest, options).then((request) => request(axios, basePath));
+        },
         /**
          * 
          * @param {string} annotationId 
@@ -1603 +1674 @@
  * @extends {BaseAPI}
  */
 export class AnnotationApi extends BaseAPI {
+    /**
+     * 
+     * @param {string} annotationId 
+     * @param {MarkAnnotationDoneRequest} [markAnnotationDoneRequest] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof AnnotationApi
+     */
+    public annotationAnnotationIdDonePut(annotationId: string, markAnnotationDoneRequest?: MarkAnnotationDoneRequest, options?: AxiosRequestConfig) {
+        return AnnotationApiFp(this.configuration).annotationAnnotationIdDonePut(annotationId, markAnnotationDoneRequest, options).then((request) => request(this.axios, this.basePath));
+    }
+
     /**
      * 
      * @param {string} annotationId 

webapp/components/annotation/AnnotationPanel.tsx

@@ -2 +2 @@
 import { AnnotationItem } from './AnnotationItem';
 import { useContext } from 'react';
 import { AnnotationContext } from '../../contexts/AnnotationContext';
+import { Button } from 'antd';
 
 /**
  * Creates a panel in the annotation screen that contains a list of annotations.
  * @returns Panel with a list of annotations.
  */
 export function AnnotationPanel() {
-    const { mappedTags } = useContext(AnnotationContext);
+    const { mappedTags, finishAnnotation } = useContext(AnnotationContext);
 
     return (
         <div>
+            <div style={{ height: '80vh', overflowY: 'auto', marginBottom: 20 }}>
+                <Stack gap={2}>
+                    {mappedTags?.map((tag, index) => {
+                        return <AnnotationItem key={index} tag={tag} />;
+                    })}
+                </Stack>
+            </div>
             <Stack gap={2}>
-                {mappedTags?.map((tag, index) => {
-                    return <AnnotationItem key={index} tag={tag} />;
-                })}
+                <Button type={'primary'} onClick={finishAnnotation}>
+                    Dokončit
+                </Button>
             </Stack>
         </div>
     );

webapp/contexts/AnnotationContext.tsx

@@ -3 +3 @@
     AnnotationInfo,
     ETagSentiment,
     ETagType,
-    SubTagInfo,
-    TagInfo,
+    MarkAnnotationDoneRequest,
     TagInstanceInfo,
 } from '../api';
 import { Tag } from '../components/types/tag';
-import { annotationController, userController } from '../controllers';
+import { annotationController } from '../controllers';
 import { GetSelectionInfo } from '../utils/selectionUtils';
-import { ShowConfirmDelete, ShowToast } from '../utils/alerts';
+import { ShowConfirm, ShowConfirmDelete, ShowToast } from '../utils/alerts';
+import { useRouter } from 'next/router';
 
 /**
  * Interface of an annotation context provider.
@@ -44 +44 @@
      */
     deleteOccurrence: (occurrence: TagInstanceInfo) => void;
 
+    /**
+     * Finishes annotation of document (marked as DONE).
+     */
+    finishAnnotation: () => void;
+
     /**
      * Changes a position of an occurrence of an annotation.
      * @param occurrence Occurrence whose position should be changed.
@@ -121 +126 @@
         return;
     },
 
+    /**
+     * Finishes annotation of document (marked as DONE).
+     */
+    finishAnnotation: () => {
+        return;
+    },
+
     /**
      * Default implementation of changePosition method.
      * @param occurrence Occurrence whose position should be changed.
@@ -188 +200 @@
 
     const [submitting, setSubmitting] = useState(false);
 
+    const router = useRouter();
+
     async function markSelectedText(
         tagId: string,
         subtagId: string | null,
@@ -254 +268 @@
         }, 'značku');
     };
 
+    /**
+     * Finishes annotation of document (marked as DONE).
+     */
+    const finishAnnotation = () => {
+        const req: MarkAnnotationDoneRequest = { done: true };
+        ShowConfirm(
+            () =>
+                annotationController
+                    .annotationAnnotationIdDonePut(props.annotationId, req)
+                    .then(() => {
+                        router.push('/documents/annotator');
+                        ShowToast('Anotování bylo úspěšně dokončeno');
+                    }),
+            'dokončit anotování'
+        );
+    };
+
     /**
      * Changes a position of an occurrence of an annotation.
      * @param occurrence Occurrence whose position should be changed.
@@ -364 +395 @@
                 setTags,
                 addOccurrence,
                 deleteOccurrence,
+                finishAnnotation,
                 changeLength,
                 changePosition,
                 changeNote,

webapp/utils/alerts.ts

@@ -1 +1 @@
 import Swal, { SweetAlertIcon, SweetAlertPosition } from 'sweetalert2';
 import withReactContent from 'sweetalert2-react-content';
-import { AxiosResponse } from 'axios';
 
 const MySwal = withReactContent(Swal);
 
@@ -43 +42 @@
         }
     });
 }
+
+export function ShowConfirm(action: () => void, actionLabel: string) {
+    Swal.fire({
+        icon: 'question',
+        title: 'Opravdu si přejete ' + actionLabel + '?',
+        showCancelButton: true,
+        confirmButtonText: 'Potvrdit',
+        confirmButtonColor: '#5278ff',
+        cancelButtonText: 'Zrušit',
+        cancelButtonColor: '#c0c0c0',
+    }).then((result) => {
+        if (result.isConfirmed) {
+            action();
+        }
+    });
+}