From eed4f1f11a213b9299eadb331585dfe654c0e780 Mon Sep 17 00:00:00 2001
From: Romain <romain.gouraud@etu.univ-nantes.fr>
Date: Wed, 17 Jan 2024 12:00:27 +0100
Subject: [PATCH] modification import des pages mail/report
---
.../Email/{intakecalculator.tsx => IntakeCalculator.ts} | 0
MedSpace/src/layouts/Email/MailIndex.tsx | 9 +++------
MedSpace/src/layouts/Email/Mailer.ts | 9 +++------
MedSpace/src/layouts/Email/htmlReportBuilder.ts | 2 +-
MedSpace/src/layouts/Email/reportBuilder.tsx | 6 +++---
5 files changed, 10 insertions(+), 16 deletions(-)
rename MedSpace/src/layouts/Email/{intakecalculator.tsx => IntakeCalculator.ts} (100%)
diff --git a/MedSpace/src/layouts/Email/intakecalculator.tsx b/MedSpace/src/layouts/Email/IntakeCalculator.ts
similarity index 100%
rename from MedSpace/src/layouts/Email/intakecalculator.tsx
rename to MedSpace/src/layouts/Email/IntakeCalculator.ts
diff --git a/MedSpace/src/layouts/Email/MailIndex.tsx b/MedSpace/src/layouts/Email/MailIndex.tsx
index dc502720d..e7761c9e4 100644
--- a/MedSpace/src/layouts/Email/MailIndex.tsx
+++ b/MedSpace/src/layouts/Email/MailIndex.tsx
@@ -1,15 +1,12 @@
-import React, { useState, useEffect, Dispatch, SetStateAction, useRef } from 'react';
-import { Alert, Modal, StyleSheet, Text, Pressable, View, Image, Button, Linking, TouchableOpacity, FlatList, ScrollView, ImageBackground } from 'react-native';
-
+import React from 'react';
+import { StyleSheet, Text, Pressable, View, ImageBackground } from 'react-native';
import { RootStackParamList } from '@navigation/RootStackParamList';
import type { NativeStackScreenProps } from '@react-navigation/native-stack';
-
import useActualPatient from '@hooks/useActualPatient';
import { htmlmailtemplate } from './Mailer'
-
-import superHtmlReportBuiler from './HtmlReportBuilder';
import EncadreLegend from './Legend'
import { ReportBuilder } from './ReportBuilder'
+
type PrescriptionIndexProps = NativeStackScreenProps<RootStackParamList, 'Email'>
export default function MailIndex({ navigation, route }: PrescriptionIndexProps) {
const { prescription } = route.params
diff --git a/MedSpace/src/layouts/Email/Mailer.ts b/MedSpace/src/layouts/Email/Mailer.ts
index b4e5a37c2..f7d8d58d1 100644
--- a/MedSpace/src/layouts/Email/Mailer.ts
+++ b/MedSpace/src/layouts/Email/Mailer.ts
@@ -1,7 +1,7 @@
import { logo } from './Logo';
import superHtmlReportBuiler from './HtmlReportBuilder';
import RNHTMLtoPDF from 'react-native-html-to-pdf';
-import RNFS from 'react-native-fs';
+
import Mailer from 'react-native-mail';
import Permissions from 'react-native-permissions';
export const htmlmailtemplate = async (prescription: PrescriptionInterface, patient: PatientInterface) => {
@@ -85,10 +85,7 @@ export const htmlmailtemplate = async (prescription: PrescriptionInterface, pati
</p>
</div>
-</body>
-
-
- `;
+</body>`;
const options = {
html: htmlContent,
@@ -99,7 +96,7 @@ export const htmlmailtemplate = async (prescription: PrescriptionInterface, pati
const pdf = await RNHTMLtoPDF.convert(options);
const pdfFilePath = pdf.filePath;
-
+
let email = prescription.doctor?.mail || "";
diff --git a/MedSpace/src/layouts/Email/htmlReportBuilder.ts b/MedSpace/src/layouts/Email/htmlReportBuilder.ts
index eb085748b..c118adca6 100644
--- a/MedSpace/src/layouts/Email/htmlReportBuilder.ts
+++ b/MedSpace/src/layouts/Email/htmlReportBuilder.ts
@@ -1,4 +1,4 @@
-import { generateCalendar } from "./intakecalculator";
+import { generateCalendar } from "./IntakeCalculator";
const htmlReportBuilder = (week: string[], num: string) => {
diff --git a/MedSpace/src/layouts/Email/reportBuilder.tsx b/MedSpace/src/layouts/Email/reportBuilder.tsx
index 93676033e..bbfdcb2ad 100644
--- a/MedSpace/src/layouts/Email/reportBuilder.tsx
+++ b/MedSpace/src/layouts/Email/reportBuilder.tsx
@@ -1,6 +1,6 @@
-import React, { useState, useEffect, Dispatch, SetStateAction, useRef } from 'react';
-import { Alert, Modal, StyleSheet, Text, Pressable, View, Image, Button, Linking, TouchableOpacity, FlatList, ScrollView, ImageBackground } from 'react-native';
-import { generateCalendar } from './intakecalculator'
+import React from 'react';
+import { StyleSheet, Text, View, FlatList } from 'react-native';
+import { generateCalendar } from './IntakeCalculator'
const RenderWeek = (week: string[], num: string) => {
--
GitLab