diff --git a/TestAPI.sln b/TestAPI.sln
index 19a1031..818afd3 100644
--- a/TestAPI.sln
+++ b/TestAPI.sln
@@ -12,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Readme.md = Readme.md
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTest", "UnitTest\UnitTest.csproj", "{3DA60C53-90BD-4D3E-A3EE-23C202269280}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -28,6 +30,10 @@ Global
{A720BF0D-868C-404E-9A87-410694A01C6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A720BF0D-868C-404E-9A87-410694A01C6F}.Release|Any CPU.Build.0 = Release|Any CPU
{A720BF0D-868C-404E-9A87-410694A01C6F}.Release|Any CPU.Deploy.0 = Release|Any CPU
+ {3DA60C53-90BD-4D3E-A3EE-23C202269280}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3DA60C53-90BD-4D3E-A3EE-23C202269280}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3DA60C53-90BD-4D3E-A3EE-23C202269280}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3DA60C53-90BD-4D3E-A3EE-23C202269280}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/TestAPI/Properties/launchSettings.json b/TestAPI/Properties/launchSettings.json
index e30b579..a8df79b 100644
--- a/TestAPI/Properties/launchSettings.json
+++ b/TestAPI/Properties/launchSettings.json
@@ -1,4 +1,4 @@
-{
+{
"$schema": "http://json.schemastore.org/launchsettings.json",
"iisSettings": {
"windowsAuthentication": false,
@@ -11,13 +11,13 @@
"profiles": {
"TestAPI": {
"commandName": "Project",
- "dotnetRunMessages": "true",
"launchBrowser": true,
"launchUrl": "swagger",
"applicationUrl": "http://localhost:5100",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
- }
+ },
+ "dotnetRunMessages": "true"
},
"IIS Express": {
"commandName": "IISExpress",
@@ -28,4 +28,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/TestAPI/TestAPI.csproj b/TestAPI/TestAPI.csproj
index 9b3812e..40160ae 100644
--- a/TestAPI/TestAPI.csproj
+++ b/TestAPI/TestAPI.csproj
@@ -1,18 +1,19 @@
- net5.0
+ net7.0
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
+
diff --git a/TestDB/Stored Procedures/usp_movecase.sql b/TestDB/Stored Procedures/usp_movecase.sql
index ea3452f..adf0224 100644
--- a/TestDB/Stored Procedures/usp_movecase.sql
+++ b/TestDB/Stored Procedures/usp_movecase.sql
@@ -1,4 +1,4 @@
-CREATE PROCEDURE [dbo].[usp_movecase]
+alter PROCEDURE [dbo].[usp_movecase]
@casetomove UNIQUEIDENTIFIER
WITH ENCRYPTION
AS
@@ -11,7 +11,41 @@ BEGIN
BEGIN TRANSACTION
BEGIN TRY
- PRINT 'your code goes here'
+ --PRINT 'your code goes here'
+ with all_data as (
+ select c.serial as case_serial,
+ c.guid as case_guid,
+ --
+ p.serial as product_serial,
+ p.guid as product_guid,
+ p.name as product_name,
+ --
+ pc.guid as productcategory_guid,
+ pc.serial as productcategory_serial,
+ pc.name as productcategoty_name,
+ --
+ pl.guid as pallet_guid,
+ pl.serial as pallet_serial
+ from dbo.[case] as c
+ left join dbo.product as p on p.guid = c.productguid
+ left join dbo.productcategory as pc on pc.guid = p.productcategoryguid
+ left join dbo.pallet as pl on pl.guid = c.palletguid
+ ),
+ to_move as (
+ select *
+ from all_data as tomove
+ where tomove.case_guid = @casetomove
+ ),
+ new_pallet as (
+ select top 1 dest.*
+ from dbo.pallet as dest
+ inner join to_move on to_move.pallet_guid != dest.guid
+ --where dest.productcategory_guid = to_move.productcategory_guid
+ where exists (select 1 from all_data as x where x.pallet_guid = dest.guid and x.productcategory_guid = to_move.productcategory_guid)
+ )
+ update dbo.[case] set palletguid = x.guid
+ from new_pallet as x
+ where dbo.[case].[guid] = @casetomove
END TRY
BEGIN CATCH
@@ -26,12 +60,14 @@ BEGIN
IF (@Result >= 0)
BEGIN
COMMIT TRANSACTION
- PRINT 'Commited Transaction at ' + GETDATE()
+ --PRINT 'Commited Transaction at ' + GETDATE()
+ PRINT 'Commited Transaction at ' + convert(varchar, GETDATE(), 121)
END
ELSE
BEGIN
ROLLBACK TRANSACTION
- PRINT 'Rolled back Transaction at ' + GETDATE() + 'because of error: ' + @_errormessage
+ --PRINT 'Rolled back Transaction at ' + GETDATE() + 'because of error: ' + @_errormessage
+ PRINT 'Rolled back Transaction at ' + convert(varchar, GETDATE(), 121) + 'because of error: ' + @_errormessage
END
END
diff --git a/TestUI/angular.json b/TestUI/angular.json
index 69f66aa..ed3a46d 100644
--- a/TestUI/angular.json
+++ b/TestUI/angular.json
@@ -1,5 +1,8 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+ "cli": {
+ "analytics": false
+ },
"version": 1,
"newProjectRoot": "projects",
"projects": {
diff --git a/TestUI/src/app/app.component.html b/TestUI/src/app/app.component.html
index 56bba0c..7a8247a 100644
--- a/TestUI/src/app/app.component.html
+++ b/TestUI/src/app/app.component.html
@@ -3,10 +3,15 @@
-
{{weather.date}}
+
{{weather.date | date: 'dd/MM/yyyy':'':'it'}}
{{weather.temperatureF}} °F
{{weather.temperatureC}} °C
-
{{weather.summary}}
+
+ {{weather.summary}}
+
diff --git a/TestUI/src/app/app.component.scss b/TestUI/src/app/app.component.scss
index 64a2c06..1dc04d3 100644
--- a/TestUI/src/app/app.component.scss
+++ b/TestUI/src/app/app.component.scss
@@ -1,3 +1,20 @@
.card {
top: 1rem;
}
+
+.weather-desc-cyan {
+ color: cyan;
+}
+
+.weather-desc-green {
+ color: green;
+}
+
+.weather-desc-orange {
+ color: orange;
+}
+
+.weather-desc-red {
+ color: red;
+}
+
diff --git a/TestUI/src/app/app.component.spec.ts b/TestUI/src/app/app.component.spec.ts
index 0254631..6c4eb62 100644
--- a/TestUI/src/app/app.component.spec.ts
+++ b/TestUI/src/app/app.component.spec.ts
@@ -1,12 +1,14 @@
import { TestBed } from '@angular/core/testing';
import { RouterTestingModule } from '@angular/router/testing';
+import { HttpClientModule } from '@angular/common/http';
import { AppComponent } from './app.component';
describe('AppComponent', () => {
beforeEach(async () => {
await TestBed.configureTestingModule({
imports: [
- RouterTestingModule
+ RouterTestingModule,
+ HttpClientModule
],
declarations: [
AppComponent
@@ -25,11 +27,12 @@ describe('AppComponent', () => {
const app = fixture.componentInstance;
expect(app.title).toEqual('TestUI');
});
-
+/*
it('should render title', () => {
const fixture = TestBed.createComponent(AppComponent);
fixture.detectChanges();
const compiled = fixture.nativeElement as HTMLElement;
expect(compiled.querySelector('.content span')?.textContent).toContain('TestUI app is running!');
});
+*/
});
diff --git a/TestUI/src/app/app.component.ts b/TestUI/src/app/app.component.ts
index 12ba596..7337ea1 100644
--- a/TestUI/src/app/app.component.ts
+++ b/TestUI/src/app/app.component.ts
@@ -9,6 +9,7 @@ import {Client, WeatherForecast} from "./weatherapp.swagger";
})
export class AppComponent {
weatherData: WeatherForecast[] = [];
+ public title: string = "TestUI";
constructor(
private client: Client
@@ -43,4 +44,5 @@ export class AppComponent {
handleError(error: string) {
alert(error);
}
+
}
diff --git a/TestUI/src/app/app.module.ts b/TestUI/src/app/app.module.ts
index 7c77949..32548b2 100644
--- a/TestUI/src/app/app.module.ts
+++ b/TestUI/src/app/app.module.ts
@@ -2,9 +2,9 @@ import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
-import {API_BASE_URL, Client} from "./weatherapp.swagger";
-import {HttpClient, HttpClientModule} from "@angular/common/http";
-import {environment} from "../environments/environment";
+import { API_BASE_URL, Client } from "./weatherapp.swagger";
+import { HttpClient, HttpClientModule } from "@angular/common/http";
+import { environment } from "../environments/environment";
@NgModule({
declarations: [
@@ -18,6 +18,7 @@ import {environment} from "../environments/environment";
providers: [
Client,
HttpClient,
+ HttpClientModule,
{provide: API_BASE_URL, useValue: environment.url},
],
bootstrap: [AppComponent]
diff --git a/TestUI/src/environments/environment.prod.ts b/TestUI/src/environments/environment.prod.ts
index 3612073..68076a8 100644
--- a/TestUI/src/environments/environment.prod.ts
+++ b/TestUI/src/environments/environment.prod.ts
@@ -1,3 +1,4 @@
export const environment = {
- production: true
+ production: true,
+ url:'https://localhost:5001'
};