Commit d07fde5a authored by Francesco Carraro's avatar Francesco Carraro
Browse files

Add RemoteOperationType enum and RemoteOperationModel class 

Introduced a new namespace `INAF.Apps.Uwp.SLabDataManager.Values` containing the `Enums` class with a new `RemoteOperationType` enumeration. This enum includes values for various remote operations like authentication, spectrum file actions, and user settings.

Added a new class `RemoteOperationModel` in the `INAF.Libraries.MAUI.HyperLab.RemoteOperations` namespace. This class has two properties: `Type` (of type `RemoteOperationType`) and `Url` (of type `string`). The `RemoteOperationModel` class utilizes the `RemoteOperationType` enum from the `INAF.Apps.Uwp.SLabDataManager.Values.Enums` namespace.

These changes were applied in multiple locations within the codebase.
parent e14fb8b2

INAF.Apps.Uwp.SLabDataManager/App.xaml.cs

+2 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ using INAF.Apps.Uwp.SLabDataManager.Models; 
using INAF.Apps.Uwp.SLabDataManager.Models.Chart;

using INAF.Apps.Uwp.SLabDataManager.Models.Chart.Smoothing;

using INAF.Apps.Uwp.SLabDataManager.Models.Containers;

using INAF.Apps.Uwp.SLabDataManager.Models.RemoteOperations;

using INAF.Apps.Uwp.SLabDataManager.Services;

using INAF.Apps.Uwp.SLabDataManager.ViewModels;

using INAF.Apps.Uwp.SLabDataManager.ViewModels.ContentDialogsViewModel;
@@ -171,7 +172,7 @@ namespace INAF.Apps.Uwp.SLabDataManager 
                .AddTransient<SplineProcessingHelper>()

                .AddTransient<ZoomHelper>()

                .AddTransient<XmlAssetConfigReader>()

                .AddTransient<XmlHelper>()

                .AddTransient<INAF.Libraries.Uwp.Xml.XmlHelper>()

                .AddTransient<XmlSerializationHelper>()

                .AddTransient<XmlSpectrumFileReader>()

                /* usercontrols viewmodels */

INAF.Apps.Uwp.SLabDataManager/Assets/xml/remoteoperations.xml

+32 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8" ?>

<remoteOperationsData>

	<!-- baseUrl has been moved into appsettings.json -->

	<!--<baseUrl>http://melody.iaps.inaf.it:80</baseUrl>-->

	<!--<baseUrl>http://localhost:81</baseUrl>-->

	<operationUrls>

		<!-- ACCOUNT -->

		<operation type="Authentication">Account/LoginForJwt</operation>

		<operation type="CheckAlive">AppActions/CheckAlive</operation>

		<operation type="IsTokenValid">Account/IsTokenValid</operation>

		<operation type="IsLoginValid">Account/IsLoginValid</operation>

		<!-- SPECTRA FILES ACTIONS -->

		<operation type="RegistrationFromApp">Account/RegistrationFromApp</operation>

		<!-- APP SPECTRA FILES ACTIONS -->

		<operation type="DeleteSpectrum">AppSpectraFilesActions/DeleteSpectrum</operation>

		<operation type="GetParentSpectrum">AppSpectraFilesActions/GetParentSpectrum</operation>

		<operation type="IsWhiteSpectrum">AppSpectraFilesActions/IsWhiteSpectrum</operation>

		<operation type="GetAlignmentSettings">AppSpectraFilesActions/GetAlignmentSettings</operation>

		<operation type="GetChildrenSpectraTypes">AppSpectraFilesActions/GetChildrenSpectraTypes</operation>

		<operation type="GetContinuumRemovalSettings">AppSpectraFilesActions/GetContinuumRemovalSettings</operation>

		<operation type="GetSpectraTypesParents">AppSpectraFilesActions/GetSpectraTypesParents</operation>

		<operation type="GetSpectrumData">AppSpectraFilesActions/GetSpectrumData</operation>

		<operation type="GetSpectrumFile">AppSpectraFilesActions/GetSpectrumFile</operation>

		<operation type="GetSmoothingSettings">AppSpectraFilesActions/GetSmoothingSettings</operation>

		<operation type="GetSpectrumVersions">AppSpectraFilesActions/GetSpectrumVersions</operation>

		<operation type="IsAnySpectrumTypeSavedOnCloud">AppSpectraFilesActions/IsAnySpectrumTypeSavedOnCloud</operation>

		<operation type="IsSpectrumTypeSavedOnCloud">AppSpectraFilesActions/IsSpectrumTypeSavedOnCloud</operation>

		<operation type="IsSpectrumTypeSavedWithCountOnCloud">AppSpectraFilesActions/IsSpectrumTypeSavedWithCountOnCloud</operation>

		<operation type="SaveSpectrumOfTypeAligned">AppSpectraFilesActions/SaveSpectrumOfTypeAligned</operation>

		<operation type="SaveSpectrumOfTypeContinuumRemoved">AppSpectraFilesActions/SaveSpectrumOfTypeContinuumRemoved</operation>

		<operation type="SaveAsCopySpectrumOfTypeContinuumRemoved">AppSpectraFilesActions/SaveAsCopySpectrumOfTypeContinuumRemoved</operation>

		<operation type="SaveSpectrumOfTypeRaw">AppSpectraFilesActions/SaveSpectrumOfTypeRaw</operation>

		<operation type="SaveSpectrumOfTypeSmoothed">AppSpectraFilesActions/SaveSpectrumOfTypeSmoothed</operation>

		<operation type="IsAnySpectrumTypeSavedOnCloud">AppSpectraFilesActions/IsAnySpectrumTypeSavedOnCloud</operation>

		<operation type="IsSpectrumTypeSavedOnCloud">AppSpectraFilesActions/IsSpectrumTypeSavedOnCloud</operation>

		<operation type="GetChildrenSpectraTypes">AppSpectraFilesActions/GetChildrenSpectraTypes</operation>

		<operation type="SaveAsCopySpectrumOfTypeSmoothed">AppSpectraFilesActions/SaveAsCopySpectrumOfTypeSmoothed</operation>

		<!-- CHARTS -->

		<operation type="GetSpectra">Charts/GetSpectra</operation>

		<operation type="GetSpectrumByParentIdAndSpectrumType">Charts/GetSpectrumByParentIdAndSpectrumTypeForApp</operation>

		<operation type="GetSpectrumById">Charts/GetSpectrumById</operation>

		<!-- USERS -->

		<operation type="GetMenu">Users/GetMenu</operation>

		<operation type="GetUserDetailsSimple">Users/GetUserDetailsSimple</operation>

		<operation type="GetUserPermissions">Users/GetUserPermissions</operation>

		<!-- PERMISSIONS -->
@@ -26,11 +44,20 @@ 
		<operation type="GetSpectrumMeasurementInfo">SampleAndMeasurement/GetSpectrumMeasurementInfo</operation>

		<operation type="GetSpectrumSampleData">SampleAndMeasurement/GetSpectrumSampleData</operation>

		<operation type="SaveInfo">SampleAndMeasurement/SaveInfo</operation>

		<!-- SEARCHES -->

		<operation type="GetMaterialsSuggestions">Searches/GetMaterialsSuggestions</operation>

		<operation type="GetSampleNameSuggestions">Searches/GetSampleNameSuggestions</operation>

		<operation type="SearchSimpleGroupsByMaterial">Searches/SearchSimpleGroupsByMaterial</operation>

		<operation type="SearchSimpleGroupsByMineralType">Searches/SearchSimpleGroupsByMineralType</operation>

		<operation type="SearchSimpleGroupsByOriginType">Searches/SearchSimpleGroupsByOriginType</operation>

		<operation type="SearchSimpleGroupsBySampleName">Searches/SearchSimpleGroupsBySampleName</operation>

		<operation type="SearchSimpleGroupsBySampleType">Searches/SearchSimpleGroupsBySampleType</operation>

		<!-- MATERIALS -->

		<operation type="GetMinerals">Materials/GetMinerals</operation>

		<operation type="GetRocks">Materials/GetRocks</operation>

		<operation type="GetSampleDataValues">Materials/GetSampleDataValues</operation>

		<!-- USER SETTINGS -->

		<operation type="GetDefaultColors">UserSettings/GetDefaultColors</operation>

		<operation type="GetFitFunctions">UserSettings/GetFitFunctions</operation>

		<operation type="GetUserSetting">UserSettings/GetUserSetting</operation>

		<operation type="GetUserSettingsByWildcard">UserSettings/GetUserSettingsByWildcard</operation>

INAF.Apps.Uwp.SLabDataManager/Extensions/Extensions.cs

+8 −0
Original line number Diff line number Diff line
@@ -11,11 +11,19 @@ using Windows.UI; 
using Windows.UI.Xaml.Media;

using static INAF.Apps.Uwp.SLabDataManager.Constants.Enums;

using static INAF.Libraries.NetStandard.HyperLabCommonModels.Values.Enums;

using static INAF.Apps.Uwp.SLabDataManager.Values.Enums;



namespace INAF.Apps.Uwp.SLabDataManager.Extensions

{

    public static class Extensions

    {

        public static RemoteOperationType ToRemoteOperationType(this string value)

        {

            RemoteOperationType result;

            Enum.TryParse(value, out result);

            return result;

        }



        #region spectrum model

        public static FileSpectrumModel ToSpectrumFileBaseInfo(this ISpectrumModel model)

        {

INAF.Apps.Uwp.SLabDataManager/Helpers/FileReaders/AssetFiles/XmlAssetConfigReader.cs

+8 −1
Original line number Diff line number Diff line
@@ -60,7 +60,14 @@ namespace INAF.Apps.Uwp.SLabDataManager.Helpers.FileReaders 
                    int measureUnit = _measureUnit.ToIntInvariant();



                    if (!alignmentViewModel.contains(index))

                        alignmentViewModel.addSeparatorWavelength(new WavelengthModel(index, currentValue, semiRange, step, measureUnit, "WavelengthLabel".GetText()));

                        alignmentViewModel.addSeparatorWavelength(new WavelengthModel(index,

                                                                                      currentValue,

                                                                                      currentValue - semiRange,

                                                                                      currentValue + semiRange,

                                                                                      semiRange,

                                                                                      step,

                                                                                      measureUnit,

                                                                                      "WavelengthLabel".GetText()));



                    index++;

                }

INAF.Apps.Uwp.SLabDataManager/Helpers/RemoteOperations/RemoteOperationsManager.cs

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ using System.Threading.Tasks; 
using System.Web;

using Windows.Web.Http;

using Windows.Web.Http.Headers;

using static INAF.Apps.Uwp.SLabDataManager.Values.Enums;

using static INAF.Libraries.NetStandard.HyperLabCommonModels.Values.Enums;



namespace INAF.Apps.Uwp.SLabDataManager.Helpers.RemoteOperations