Viewer to Server

This commit is contained in:
2023-02-16 15:17:31 -07:00
parent 5c50078c04
commit a25dc93610
968 changed files with 16395 additions and 2385 deletions
.editorconfig.gitignore.groovy
.vscode
Archive
JenkinsfileOI-Metrology.sln
Server
.vscode
ApiControllers
ApiLoggingMiddleware.cs
Controllers
Data
Models
OI.Metrology.Server.csprojProgram.cs
Properties
Repositories
Services
Views
appsettings.Development.jsonappsettings.jsoncompilerconfig.jsoncompilerconfig.json.defaults
wwwroot
igniteui
css
README.ja.mdREADME.md
structure
fonts
images
infragistics.css
modules
themes
README.ja.mdREADME.md
bootstrap3
README.ja.mdREADME.md
default
flatly
yeti
js
extensions
i18n
infragistics.core.jsinfragistics.dv.jsinfragistics.excel-bundled.jsinfragistics.loader.jsinfragistics.lob.jsinfragistics.scheduler-bundled.jsinfragistics.spreadsheet-bundled.js
modules
encoding
i18n
infragistics.datasource-bg.jsinfragistics.datasource-de.jsinfragistics.datasource-en.jsinfragistics.datasource-es.jsinfragistics.datasource-fr.jsinfragistics.datasource-ja.jsinfragistics.datasource-ru.jsinfragistics.documents.core_core-bg.jsinfragistics.documents.core_core-de.jsinfragistics.documents.core_core-en.jsinfragistics.documents.core_core-es.jsinfragistics.documents.core_core-fr.jsinfragistics.documents.core_core-ja.jsinfragistics.documents.core_core-ru.jsinfragistics.dvcommonwidget-bg.jsinfragistics.dvcommonwidget-de.jsinfragistics.dvcommonwidget-en.jsinfragistics.dvcommonwidget-es.jsinfragistics.dvcommonwidget-fr.jsinfragistics.dvcommonwidget-ja.jsinfragistics.dvcommonwidget-ru.jsinfragistics.excel_core-bg.jsinfragistics.excel_core-de.jsinfragistics.excel_core-en.jsinfragistics.excel_core-es.jsinfragistics.excel_core-fr.jsinfragistics.excel_core-ja.jsinfragistics.excel_core-ru.jsinfragistics.scheduler.core-bg.jsinfragistics.scheduler.core-de.jsinfragistics.scheduler.core-en.jsinfragistics.scheduler.core-es.jsinfragistics.scheduler.core-fr.jsinfragistics.scheduler.core-ja.jsinfragistics.scheduler.core-ru.jsinfragistics.shared-bg.jsinfragistics.shared-de.jsinfragistics.shared-en.jsinfragistics.shared-es.jsinfragistics.shared-fr.jsinfragistics.shared-ja.jsinfragistics.shared-ru.jsinfragistics.spreadsheet-bg.jsinfragistics.spreadsheet-de.jsinfragistics.spreadsheet-en.jsinfragistics.spreadsheet-es.jsinfragistics.spreadsheet-fr.jsinfragistics.spreadsheet-ja.jsinfragistics.spreadsheet-ru.jsinfragistics.templating-bg.jsinfragistics.templating-de.jsinfragistics.templating-en.jsinfragistics.templating-es.jsinfragistics.templating-fr.jsinfragistics.templating-ja.jsinfragistics.templating-ru.jsinfragistics.ui.barcode-bg.jsinfragistics.ui.barcode-de.jsinfragistics.ui.barcode-en.jsinfragistics.ui.barcode-es.jsinfragistics.ui.barcode-fr.jsinfragistics.ui.barcode-ja.jsinfragistics.ui.barcode-ru.jsinfragistics.ui.bulletgraph-bg.jsinfragistics.ui.bulletgraph-de.jsinfragistics.ui.bulletgraph-en.jsinfragistics.ui.bulletgraph-es.jsinfragistics.ui.bulletgraph-fr.jsinfragistics.ui.bulletgraph-ja.jsinfragistics.ui.bulletgraph-ru.jsinfragistics.ui.combo-bg.jsinfragistics.ui.combo-de.jsinfragistics.ui.combo-en.jsinfragistics.ui.combo-es.jsinfragistics.ui.combo-fr.jsinfragistics.ui.combo-ja.jsinfragistics.ui.combo-ru.jsinfragistics.ui.dialog-bg.jsinfragistics.ui.dialog-de.jsinfragistics.ui.dialog-en.jsinfragistics.ui.dialog-es.jsinfragistics.ui.dialog-fr.jsinfragistics.ui.dialog-ja.jsinfragistics.ui.dialog-ru.jsinfragistics.ui.doughnutchart-bg.jsinfragistics.ui.doughnutchart-de.jsinfragistics.ui.doughnutchart-en.jsinfragistics.ui.doughnutchart-es.jsinfragistics.ui.doughnutchart-fr.jsinfragistics.ui.doughnutchart-ja.jsinfragistics.ui.doughnutchart-ru.jsinfragistics.ui.editors-bg.jsinfragistics.ui.editors-de.jsinfragistics.ui.editors-en.jsinfragistics.ui.editors-es.jsinfragistics.ui.editors-fr.jsinfragistics.ui.editors-ja.jsinfragistics.ui.editors-ru.jsinfragistics.ui.grid-bg.jsinfragistics.ui.grid-de.jsinfragistics.ui.grid-en.jsinfragistics.ui.grid-es.jsinfragistics.ui.grid-fr.jsinfragistics.ui.grid-ja.jsinfragistics.ui.grid-ru.jsinfragistics.ui.htmleditor-bg.jsinfragistics.ui.htmleditor-de.jsinfragistics.ui.htmleditor-en.jsinfragistics.ui.htmleditor-es.jsinfragistics.ui.htmleditor-fr.jsinfragistics.ui.htmleditor-ja.jsinfragistics.ui.htmleditor-ru.jsinfragistics.ui.lineargauge-bg.jsinfragistics.ui.lineargauge-de.jsinfragistics.ui.lineargauge-en.jsinfragistics.ui.lineargauge-es.jsinfragistics.ui.lineargauge-fr.jsinfragistics.ui.lineargauge-ja.jsinfragistics.ui.lineargauge-ru.jsinfragistics.ui.notifier-bg.jsinfragistics.ui.notifier-de.jsinfragistics.ui.notifier-en.jsinfragistics.ui.notifier-es.jsinfragistics.ui.notifier-fr.jsinfragistics.ui.notifier-ja.jsinfragistics.ui.notifier-ru.jsinfragistics.ui.pivot.shared-bg.jsinfragistics.ui.pivot.shared-de.jsinfragistics.ui.pivot.shared-en.jsinfragistics.ui.pivot.shared-es.jsinfragistics.ui.pivot.shared-fr.jsinfragistics.ui.pivot.shared-ja.jsinfragistics.ui.pivot.shared-ru.jsinfragistics.ui.pivotdataselector-bg.jsinfragistics.ui.pivotdataselector-de.jsinfragistics.ui.pivotdataselector-en.jsinfragistics.ui.pivotdataselector-es.jsinfragistics.ui.pivotdataselector-fr.jsinfragistics.ui.pivotdataselector-ja.jsinfragistics.ui.pivotdataselector-ru.jsinfragistics.ui.pivotgrid-bg.jsinfragistics.ui.pivotgrid-de.jsinfragistics.ui.pivotgrid-en.jsinfragistics.ui.pivotgrid-es.jsinfragistics.ui.pivotgrid-fr.jsinfragistics.ui.pivotgrid-ja.jsinfragistics.ui.pivotgrid-ru.jsinfragistics.ui.popover-bg.jsinfragistics.ui.popover-de.jsinfragistics.ui.popover-en.jsinfragistics.ui.popover-es.jsinfragistics.ui.popover-fr.jsinfragistics.ui.popover-ja.jsinfragistics.ui.popover-ru.jsinfragistics.ui.radialgauge-bg.jsinfragistics.ui.radialgauge-de.jsinfragistics.ui.radialgauge-en.jsinfragistics.ui.radialgauge-es.jsinfragistics.ui.radialgauge-fr.jsinfragistics.ui.radialgauge-ja.jsinfragistics.ui.radialgauge-ru.jsinfragistics.ui.radialmenu-bg.jsinfragistics.ui.radialmenu-de.jsinfragistics.ui.radialmenu-en.jsinfragistics.ui.radialmenu-es.jsinfragistics.ui.radialmenu-fr.jsinfragistics.ui.radialmenu-ja.jsinfragistics.ui.radialmenu-ru.jsinfragistics.ui.rating-bg.jsinfragistics.ui.rating-de.jsinfragistics.ui.rating-en.jsinfragistics.ui.rating-es.jsinfragistics.ui.rating-fr.jsinfragistics.ui.rating-ja.jsinfragistics.ui.rating-ru.jsinfragistics.ui.scheduler-bg.jsinfragistics.ui.scheduler-de.jsinfragistics.ui.scheduler-en.jsinfragistics.ui.scheduler-es.jsinfragistics.ui.scheduler-fr.jsinfragistics.ui.scheduler-ja.jsinfragistics.ui.scheduler-ru.jsinfragistics.ui.scroll-bg.jsinfragistics.ui.scroll-de.jsinfragistics.ui.scroll-en.jsinfragistics.ui.scroll-es.jsinfragistics.ui.scroll-fr.jsinfragistics.ui.scroll-ja.jsinfragistics.ui.scroll-ru.jsinfragistics.ui.splitter-bg.jsinfragistics.ui.splitter-de.jsinfragistics.ui.splitter-en.jsinfragistics.ui.splitter-es.jsinfragistics.ui.splitter-fr.jsinfragistics.ui.splitter-ja.jsinfragistics.ui.splitter-ru.jsinfragistics.ui.tilemanager-bg.jsinfragistics.ui.tilemanager-de.jsinfragistics.ui.tilemanager-en.jsinfragistics.ui.tilemanager-es.jsinfragistics.ui.tilemanager-fr.jsinfragistics.ui.tilemanager-ja.jsinfragistics.ui.tilemanager-ru.jsinfragistics.ui.toolbar-bg.jsinfragistics.ui.toolbar-de.jsinfragistics.ui.toolbar-en.jsinfragistics.ui.toolbar-es.jsinfragistics.ui.toolbar-fr.jsinfragistics.ui.toolbar-ja.jsinfragistics.ui.toolbar-ru.jsinfragistics.ui.tree-bg.jsinfragistics.ui.tree-de.jsinfragistics.ui.tree-en.jsinfragistics.ui.tree-es.jsinfragistics.ui.tree-fr.jsinfragistics.ui.tree-ja.jsinfragistics.ui.tree-ru.jsinfragistics.ui.treegrid-bg.jsinfragistics.ui.treegrid-de.jsinfragistics.ui.treegrid-en.jsinfragistics.ui.treegrid-es.jsinfragistics.ui.treegrid-fr.jsinfragistics.ui.treegrid-ja.jsinfragistics.ui.treegrid-ru.jsinfragistics.ui.upload-bg.jsinfragistics.ui.upload-de.jsinfragistics.ui.upload-en.jsinfragistics.ui.upload-es.jsinfragistics.ui.upload-fr.jsinfragistics.ui.upload-ja.jsinfragistics.ui.upload-ru.jsinfragistics.ui.validator-bg.jsinfragistics.ui.validator-de.jsinfragistics.ui.validator-en.jsinfragistics.ui.validator-es.jsinfragistics.ui.validator-fr.jsinfragistics.ui.validator-ja.jsinfragistics.ui.validator-ru.jsinfragistics.ui.videoplayer-bg.jsinfragistics.ui.videoplayer-de.jsinfragistics.ui.videoplayer-en.jsinfragistics.ui.videoplayer-es.jsinfragistics.ui.videoplayer-fr.jsinfragistics.ui.videoplayer-ja.jsinfragistics.ui.videoplayer-ru.jsinfragistics.ui.zoombar-bg.jsinfragistics.ui.zoombar-de.jsinfragistics.ui.zoombar-en.jsinfragistics.ui.zoombar-es.jsinfragistics.ui.zoombar-fr.jsinfragistics.ui.zoombar-ja.jsinfragistics.ui.zoombar-ru.jsinfragistics.undo-bg.jsinfragistics.undo-de.jsinfragistics.undo-en.jsinfragistics.undo-es.jsinfragistics.undo-fr.jsinfragistics.undo-ja.jsinfragistics.undo-ru.jsinfragistics.util-bg.jsinfragistics.util-de.jsinfragistics.util-en.jsinfragistics.util-es.jsinfragistics.util-fr.jsinfragistics.util-ja.jsinfragistics.util-ru.js
regional
infragistics.ui.regional-af.jsinfragistics.ui.regional-ar.jsinfragistics.ui.regional-az.jsinfragistics.ui.regional-bg.jsinfragistics.ui.regional-bs.jsinfragistics.ui.regional-ca.jsinfragistics.ui.regional-cs.jsinfragistics.ui.regional-da.jsinfragistics.ui.regional-de.jsinfragistics.ui.regional-el.jsinfragistics.ui.regional-en-GB.jsinfragistics.ui.regional-en.jsinfragistics.ui.regional-es-419.jsinfragistics.ui.regional-es-MX.jsinfragistics.ui.regional-es.jsinfragistics.ui.regional-et.jsinfragistics.ui.regional-fa.jsinfragistics.ui.regional-fi.jsinfragistics.ui.regional-fo.jsinfragistics.ui.regional-fr-CH.jsinfragistics.ui.regional-fr.jsinfragistics.ui.regional-he.jsinfragistics.ui.regional-hr.jsinfragistics.ui.regional-hu.jsinfragistics.ui.regional-hy.jsinfragistics.ui.regional-i18n.jsinfragistics.ui.regional-id.jsinfragistics.ui.regional-is.jsinfragistics.ui.regional-it.jsinfragistics.ui.regional-ja.jsinfragistics.ui.regional-ko.jsinfragistics.ui.regional-lt.jsinfragistics.ui.regional-lv.jsinfragistics.ui.regional-ms.jsinfragistics.ui.regional-nl.jsinfragistics.ui.regional-no.jsinfragistics.ui.regional-pl.jsinfragistics.ui.regional-pt-BR.jsinfragistics.ui.regional-ro.jsinfragistics.ui.regional-ru.jsinfragistics.ui.regional-sk.jsinfragistics.ui.regional-sl.jsinfragistics.ui.regional-sq.jsinfragistics.ui.regional-sr-SR.jsinfragistics.ui.regional-sr.jsinfragistics.ui.regional-sv.jsinfragistics.ui.regional-ta.jsinfragistics.ui.regional-th.jsinfragistics.ui.regional-tr.jsinfragistics.ui.regional-uk.jsinfragistics.ui.regional-vi.jsinfragistics.ui.regional-zh-CN.jsinfragistics.ui.regional-zh-HK.jsinfragistics.ui.regional-zh-TW.js
infragistics.barcode_core.jsinfragistics.barcode_qrcodebarcode.jsinfragistics.bulletgraph.jsinfragistics.categorychart.jsinfragistics.datachart_annotation.jsinfragistics.datachart_category.jsinfragistics.datachart_categorycore.jsinfragistics.datachart_core.jsinfragistics.datachart_domainChart.jsinfragistics.datachart_extendedaxes.jsinfragistics.datachart_extendedfinancial.jsinfragistics.datachart_financial.jsinfragistics.datachart_interactivity.jsinfragistics.datachart_polar.jsinfragistics.datachart_radial.jsinfragistics.datachart_rangecategory.jsinfragistics.datachart_scatter.jsinfragistics.datachart_shape.jsinfragistics.datachart_stacked.jsinfragistics.datachart_verticalcategory.jsinfragistics.datachart_visualdata.jsinfragistics.datasource.jsinfragistics.documents.core_core.jsinfragistics.documents.core_openxml.jsinfragistics.doughnutchart.jsinfragistics.dv_core.jsinfragistics.dv_dataseriesadapter.jsinfragistics.dv_datasource.jsinfragistics.dv_description.jsinfragistics.dv_geo.jsinfragistics.dv_geometry.jsinfragistics.dv_interactivity.jsinfragistics.dv_jquerydom.jsinfragistics.dv_opd.jsinfragistics.dv_visualdata.jsinfragistics.dvcommonwidget.jsinfragistics.excel_core.jsinfragistics.excel_functions.jsinfragistics.excel_serialization_biff8.jsinfragistics.excel_serialization_openxml.jsinfragistics.ext_collections.jsinfragistics.ext_collectionsextended.jsinfragistics.ext_core.jsinfragistics.ext_io.jsinfragistics.ext_text.jsinfragistics.ext_threading.jsinfragistics.ext_ui.jsinfragistics.ext_web.jsinfragistics.ext_xml.jsinfragistics.financialchart.jsinfragistics.funnelchart.jsinfragistics.geographicmap_core.jsinfragistics.gridexcelexporter.jsinfragistics.legend.jsinfragistics.lineargauge.jsinfragistics.olap.jsinfragistics.olapdatasource.doc.jsinfragistics.olapflatdatasource.jsinfragistics.olapxmladatasource.jsinfragistics.piechart.jsinfragistics.radialgauge.jsinfragistics.radialmenu.jsinfragistics.scheduler.core.jsinfragistics.shapechart.jsinfragistics.sparkline.jsinfragistics.spreadsheet.jsinfragistics.templating.jsinfragistics.ui.barcode.jsinfragistics.ui.basechart.jsinfragistics.ui.bulletgraph.jsinfragistics.ui.categorychart.jsinfragistics.ui.chart.jsinfragistics.ui.chart.template.jsinfragistics.ui.chartlegend.jsinfragistics.ui.colorpicker.jsinfragistics.ui.colorpickersplitbutton.jsinfragistics.ui.combo.jsinfragistics.ui.dialog.jsinfragistics.ui.doughnutchart.jsinfragistics.ui.editors.jsinfragistics.ui.financialchart.jsinfragistics.ui.funnelchart.jsinfragistics.ui.grid.appendrowsondemand.jsinfragistics.ui.grid.cellmerging.jsinfragistics.ui.grid.columnfixing.jsinfragistics.ui.grid.columnmoving.jsinfragistics.ui.grid.featurechooser.jsinfragistics.ui.grid.filtering.jsinfragistics.ui.grid.framework.jsinfragistics.ui.grid.groupby.jsinfragistics.ui.grid.hiding.jsinfragistics.ui.grid.hierarchical.jsinfragistics.ui.grid.multicolumnheaders.jsinfragistics.ui.grid.paging.jsinfragistics.ui.grid.resizing.jsinfragistics.ui.grid.responsive.jsinfragistics.ui.grid.rowselectors.jsinfragistics.ui.grid.selection.jsinfragistics.ui.grid.shared.jsinfragistics.ui.grid.sorting.jsinfragistics.ui.grid.summaries.jsinfragistics.ui.grid.tooltips.jsinfragistics.ui.grid.updating.jsinfragistics.ui.htmleditor.jsinfragistics.ui.layoutmanager.jsinfragistics.ui.lineargauge.jsinfragistics.ui.map.jsinfragistics.ui.map.template.jsinfragistics.ui.notifier.jsinfragistics.ui.pivot.shared.jsinfragistics.ui.pivotdataselector.jsinfragistics.ui.pivotgrid.jsinfragistics.ui.pivotview.jsinfragistics.ui.popover.jsinfragistics.ui.qrcodebarcode.jsinfragistics.ui.radialgauge.jsinfragistics.ui.radialmenu.jsinfragistics.ui.rating.jsinfragistics.ui.scheduler.core.jsinfragistics.ui.scheduler.jsinfragistics.ui.scroll.jsinfragistics.ui.shapechart.jsinfragistics.ui.shared.jsinfragistics.ui.sparkline.jsinfragistics.ui.splitbutton.jsinfragistics.ui.splitter.jsinfragistics.ui.spreadsheet.jsinfragistics.ui.tilemanager.jsinfragistics.ui.toolbar.jsinfragistics.ui.toolbarbutton.jsinfragistics.ui.tree.jsinfragistics.ui.treegrid.columnfixing.jsinfragistics.ui.treegrid.columnmoving.jsinfragistics.ui.treegrid.filtering.jsinfragistics.ui.treegrid.hiding.jsinfragistics.ui.treegrid.jsinfragistics.ui.treegrid.multicolumnheaders.jsinfragistics.ui.treegrid.paging.jsinfragistics.ui.treegrid.resizing.jsinfragistics.ui.treegrid.rowselectors.jsinfragistics.ui.treegrid.selection.jsinfragistics.ui.treegrid.sorting.jsinfragistics.ui.treegrid.tooltips.jsinfragistics.ui.treegrid.updating.jsinfragistics.ui.upload.jsinfragistics.ui.validator.jsinfragistics.ui.videoplayer.jsinfragistics.ui.widget.jsinfragistics.ui.zoombar.jsinfragistics.ui.zoomslider.jsinfragistics.undo.jsinfragistics.util.jquery.jsinfragistics.util.jsinfragistics.xml.jsinfragistics.zoomslider_core.js
images
js
styles
Shared
Tests
View
Viewer
azure-pipelines-server-development.ymlazure-pipelines-server.yml

@ -4,11 +4,11 @@ using System;
using System.IO;
using System.Linq;
namespace OI.Metrology.Archive.ApiContollers;
namespace OI.Metrology.Archive.ApiControllers;
using OI.Metrology.Archive.Models;
using OI.Metrology.Shared.DataModels;
using OI.Metrology.Shared.Repositories;
using OI.Metrology.Shared.Models.Stateless;
using OI.Metrology.Shared.Services;
using System.Collections.Generic;
using System.Text.Json;
@ -21,15 +21,15 @@ public class ToolTypesController : Controller
// it is named after the /api/tooltypes prefix
// the URL pattern is RESTful and the tool type is the root of every request
private readonly IMetrologyRepo _Repo;
private readonly AppSettings _AppSettings;
private readonly IAttachmentsService _AttachmentsService;
private readonly IMetrologyRepository _MetrologyRepository;
public ToolTypesController(AppSettings appSettings, IMetrologyRepo repo, IAttachmentsService attachmentsService)
public ToolTypesController(AppSettings appSettings, IMetrologyRepository metrologyRepository, IAttachmentsService attachmentsService)
{
_Repo = repo;
_AppSettings = appSettings;
_AttachmentsService = attachmentsService;
_MetrologyRepository = metrologyRepository;
}
// Get a list of tooltypes, returns just Name and ID
@ -38,7 +38,7 @@ public class ToolTypesController : Controller
{
var r = new
{
Results = _Repo.GetToolTypes().Select(tt => new { tt.ToolTypeName, tt.ID })
Results = _MetrologyRepository.GetToolTypes().Select(tt => new { tt.ToolTypeName, tt.ID })
};
return Json(r, new JsonSerializerOptions { PropertyNamingPolicy = null, WriteIndented = true });
}
@ -48,8 +48,8 @@ public class ToolTypesController : Controller
[HttpGet("/api/tooltypes/{id}")]
public IActionResult GetToolTypeMetadata(int id, string sortby = "")
{
ToolType tt = _Repo.GetToolTypeByID(id);
IEnumerable<ToolTypeMetadata> md = _Repo.GetToolTypeMetadataByToolTypeID(id);
ToolType tt = _MetrologyRepository.GetToolTypeByID(id);
IEnumerable<ToolTypeMetadata> md = _MetrologyRepository.GetToolTypeMetadataByToolTypeID(id);
if (string.Equals(sortby, "grid", StringComparison.OrdinalIgnoreCase))
md = md.OrderBy(f => f.GridDisplayOrder).ToList();
@ -80,7 +80,7 @@ public class ToolTypesController : Controller
{
long totalRecs;
System.Data.DataTable dt = _Repo.GetHeaders(id, datebegin, dateend, page, pagesize, headerid, out totalRecs);
System.Data.DataTable dt = _MetrologyRepository.GetHeaders(id, datebegin, dateend, page, pagesize, headerid, out totalRecs);
var r = new
{
@ -101,7 +101,7 @@ public class ToolTypesController : Controller
{
long totalRecs;
IEnumerable<HeaderCommon> dt = _Repo.GetHeaderTitles(id, page, pagesize, out totalRecs);
IEnumerable<HeaderCommon> dt = _MetrologyRepository.GetHeaderTitles(id, page, pagesize, out totalRecs);
var r = new
{
@ -121,7 +121,7 @@ public class ToolTypesController : Controller
{
var r = new
{
Results = _Repo.GetHeaderFields(id, headerid).Select(x => new { Column = x.Key, x.Value }).ToList()
Results = _MetrologyRepository.GetHeaderFields(id, headerid).Select(x => new { Column = x.Key, x.Value }).ToList()
};
string json = JsonConvert.SerializeObject(r);
@ -137,7 +137,7 @@ public class ToolTypesController : Controller
var r = new
{
Results = _Repo.GetDataSharePoint(id, title)
Results = _MetrologyRepository.GetDataSharePoint(id, title)
};
string json = JsonConvert.SerializeObject(r);
@ -152,7 +152,7 @@ public class ToolTypesController : Controller
var r = new
{
Results = _Repo.GetData(id, headerid)
Results = _MetrologyRepository.GetData(id, headerid)
};
string json = JsonConvert.SerializeObject(r);
@ -168,7 +168,7 @@ public class ToolTypesController : Controller
string filename)
{
ToolType tt = _Repo.GetToolTypeByID(toolTypeId);
ToolType tt = _MetrologyRepository.GetToolTypeByID(toolTypeId);
bool header = !string.Equals(tabletype.Trim(), "data", StringComparison.OrdinalIgnoreCase);
@ -191,7 +191,7 @@ public class ToolTypesController : Controller
public IActionResult OIExport(int toolTypeId, long headerid)
{
// Call the export stored procedure
System.Data.DataSet ds = _Repo.GetOIExportData(toolTypeId, headerid);
System.Data.DataSet ds = _MetrologyRepository.GetOIExportData(toolTypeId, headerid);
try
{
@ -213,7 +213,7 @@ public class ToolTypesController : Controller
foreach (object o in ds.Tables[1].Rows[0].ItemArray)
{
if ((o != null) && (!Convert.IsDBNull(o)))
if ((o is not null) && (!Convert.IsDBNull(o)))
_ = sb.Append(Convert.ToString(o));
_ = sb.Append('\t');
}
@ -223,7 +223,7 @@ public class ToolTypesController : Controller
{
foreach (object o in dr.ItemArray)
{
if ((o != null) && (!Convert.IsDBNull(o)))
if ((o is not null) && (!Convert.IsDBNull(o)))
_ = sb.Append(Convert.ToString(o));
_ = sb.Append('\t');
}