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

Refactor and update various files 

- Updated `remoteoperations.xml` to remove `ExtServices` and `Searches` operations, added `SLabDataManager` operations.
- Changed version in `Package.appxmanifest` from `1.0.50.0` to `1.0.53.0`.
- Renamed `MeteorClass` to `MeteoriteClass` in `ChartViewModelInfo.cs`, `InfoSampleDataViewModel.cs`, and `SampleDataSelectedValues.cs`.
- Added `FolderDepth` property to `QueryOptions` in `MultipleSelectionViewModel.cs` and added debug logging for file paths and names.
- Changed `TextTrimming` to `TextWrapping` in `MainPage.xaml`.
parent f7aaf503

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

+8 −10
Original line number Diff line number Diff line
@@ -14,9 +14,8 @@ 
		<operation type="GetSpectra">Charts/GetSpectra</operation>

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

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

		<!-- EXTSERVICES -->

		<operation type="GetMeteorClasses">ExtServices/GetMeteorClasses</operation>

		<!-- MATERIALS -->

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

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

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

		<operation type="GetRocks">Materials/GetRocks</operation>
@@ -27,14 +26,13 @@ 
		<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>

		<!-- SLAB DATA MANAGER -->

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

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

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

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

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

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

		<!-- SPECTRA FILES -->

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

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

INAF.Apps.Uwp.SLabDataManager/Package.appxmanifest

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
  <Identity

    Name="INAF.Apps.Uwp.SLabDataManager"

    Publisher="CN=INAF-IAPS, O=INAF-IAPS, C=IT"

    Version="1.0.50.0" />

    Version="1.0.53.0" />



  <mp:PhoneIdentity PhoneProductId="07F38165-05DE-4ED7-8514-60D1E8CDCBFE" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>

INAF.Apps.Uwp.SLabDataManager/ViewModels/ChartViewModelInfo.cs

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels 
                        MineralTypeId = InfoSampleDataViewModel.SelectedMineralTypeValue.Id,

                        Minerals = selectedMinerals,

                        Rock = selectedRock,

                        MeteorClass = selectedMeteorClass,

                        MeteoriteClass = selectedMeteorClass,

                    },

                    SpectrumFileMeasurementInfoValues = new SpectrumFileMeasurementInfoValues()

                    {

INAF.Apps.Uwp.SLabDataManager/ViewModels/Other/MultipleSelectionViewModel.cs

+11 −2
Original line number Diff line number Diff line
@@ -220,7 +220,10 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels.Other 
            {

                ".txt"

            };

            QueryOptions queryOptions = new QueryOptions(CommonFileQuery.OrderByName, fileTypeFilter);

            QueryOptions queryOptions = new QueryOptions(CommonFileQuery.OrderByName, fileTypeFilter)

            {

                FolderDepth = FolderDepth.Shallow

            };

            var results = folder.CreateFileQueryWithOptions(queryOptions);

            var files = await results.GetFilesAsync();
@@ -228,6 +231,12 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels.Other 
            if (files?.Count > 0)

            {

                Files = new ObservableCollection<InputFileModel>(files.Select(x => new InputFileModel(x.Path, x.DisplayName)));

#if DEBUG

                foreach (var file in Files)

                {

                    System.Diagnostics.Debug.WriteLine($"path: {file.Path}, file: {file.Name}");

                }

#endif

                AreFilesFound = true;

                IsFolderExplanationVisible = true;

            }

INAF.Apps.Uwp.SLabDataManager/ViewModels/UserControlViewModels/ChartPanels/InfoSampleDataViewModel.cs

+2 −2
Original line number Diff line number Diff line
@@ -499,8 +499,8 @@ namespace INAF.Apps.Uwp.SLabDataManager.ViewModels.UserControlViewModels 
                SelectedSuggestedRock = sampleDataSelectedValues.Rock;



            /* selected meteor class */

            if (sampleDataSelectedValues.MeteorClass != null)

                SelectedSuggestedMeteorClass = sampleDataSelectedValues.MeteorClass;

            if (sampleDataSelectedValues.MeteoriteClass != null)

                SelectedSuggestedMeteorClass = sampleDataSelectedValues.MeteoriteClass;

        }

        #endregion