Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Paolo Possanzini
2018-09-21 08:37:39 +02:00
parent 37a17d06d2 58bd3fb700
commit f4e794034e
42 changed files with 424 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Step/App.config
+1 -1
View File
@@ -22,7 +22,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
Step/Controllers/WebApi/NcFileController.cs
+6
View File
@@ -291,6 +291,12 @@ namespace Step.Controllers.WebApi
}
}
[Route("macros")]
public IHttpActionResult GetMacros()
{
return Ok(MacrosConfig);
}
public class MoveItems
{
public int ObjectId;
Step/Step.csproj
+2 -2
View File
@@ -97,8 +97,8 @@
<Reference Include="Microsoft.Owin.StaticFiles, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Owin.StaticFiles.3.1.0\lib\net45\Microsoft.Owin.StaticFiles.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
<HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
Step/packages.config
+1 -1
View File
@@ -27,7 +27,7 @@
<package id="Microsoft.Owin.Security.OAuth" version="3.1.0" targetFramework="net462" />
<package id="Microsoft.Owin.StaticFiles" version="3.1.0" targetFramework="net462" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net462" />
<package id="Owin" version="1.0" targetFramework="net462" />
<package id="Swashbuckle" version="5.6.0" targetFramework="net462" />
<package id="Swashbuckle.Core" version="5.6.0" targetFramework="net462" />
Step/wwwroot/package.json
+1 -1
View File
@@ -22,7 +22,7 @@
"vue-drag-drop": "1.1.0",
"vue-smooth-dnd": "0.2.1",
"vue2-ace-editor": "0.0.11",
"brace":"0.11.1"
"brace": "0.11.1"
},
"devDependencies": {
"autoprefixer": "^7.1.2",
Step/wwwroot/src/@types/tooling.d.ts
Vendored
+1
View File
@@ -15,6 +15,7 @@ declare module server {
multitoolOptionActive: boolean
familyOptionActive: boolean
magPositionOptionActive: boolean
offsetOptionActive: boolean
}
export interface EdgesConfiguration {
Step/wwwroot/src/components/tooling/tooling-equipment.ts
+5 -1
View File
@@ -25,7 +25,11 @@ export default class toolingEquipment extends Vue {
public get familyOptionActive(): boolean {
return (this.$store.state as AppModel).tooling.familyOptionActive;
}
public get offsetOptionActive(): boolean {
return (this.$store.state as AppModel).tooling.offsetOptionActive;
}
public get tools(): server.Tool[] { return (this.$store.state as AppModel).tooling.tools; }
public get ncTools(): server.ToolNc[] { return (this.$store.state as AppModel).tooling.ncTools; }
Step/wwwroot/src/components/tooling/tooling-equipment.vue
+2 -2
View File
@@ -57,7 +57,7 @@
<span v-if="ed.id>=0">{{'tooling_edgesdataequip_skill_tools' | localize("Offset")}} {{ed.id}}</span>
<span v-if="!ed.id || ed.id<=0">{{'tooling_edgesdataequip_new' | localize("Nuovo Offset")}}</span>
</button>
<div class="tab plus" :class="{'avoid-clicks': enableAddEdge}">
<div class="tab plus" :class="{'avoid-clicks': enableAddEdge}" v-if="offsetOptionActive">
<button class="btn" @click="addOffset(selectedTool)"><i class="fa fa-plus"></i></button>
</div>
</div>
@@ -147,7 +147,7 @@
</div>
<div class="box-right-body" v-if="enableEquipment && !isSiemens">
<button class="btn deleteElement" @click="deleteEdgeData(selectedTool,selectedEquipment)"><i class="fa fa-trash"></i></button>
<button class="btn deleteElement" @click="deleteEdgeData(selectedTool,selectedEquipment)" v-if="offsetOptionActive"><i class="fa fa-trash"></i></button>
<div class="box-right-label-header" v-if="selectedEquipment.id>=0">{{'tooling_edgesdata_label_edit' | localize("Modifica Tagliente n. %d",selectedEquipment.id)}}</div>
<!-- <div class="box-right-label-header" v-if="!selectedEquipment.id || selectedEquipment.id<0">{{'tooling_edgesdata_label_new' | localize("Creazione nuovo Tagliente")}}</div> -->
<div class="list-skill-equipment scrollable">
Step/wwwroot/src/modules/base-components/cards/card-queue-production.vue
+19 -19
View File
@@ -25,9 +25,9 @@
</div>
</div> -->
<div class="queue-body scrollable" v-if="selectedTab == 'Sinistra'">
<Container @drag-start="onDrag" @drag-end="onDragEnd" @drop="changePosition($event)" :get-child-payload="getPayloadForItemQueue">
<Container @drop="changePosition($event)" :get-child-payload="getPayloadForItemQueue">
<Draggable v-for="pp in partPrograms" :key="pp.id">
<div class="element-queue">
<div class="draggable-item element-queue">
<label class="number">{{pp.id}}</label><card-element-queue @click="deleteItemQueue(selectedProcess, pp)" :selected-process="selectedProcess" :id-part-program="pp.id" :name="pp.partProgramName" :number="pp.reps" :remaining-reps="pp.remainingReps" :status="pp.status" @position="positionBoxReps($event,pp)"></card-element-queue>
</div>
</Draggable>
@@ -111,19 +111,18 @@ export default {
await new FileService().deleteQueue(id);
},
async deleteItemQueue(processId, item){
debugger
await new FileService().deleteItemQueue(processId, item);
},
onDrag({ isSource, payload, willAcceptDrop }) {
this.enablePopup = false;
this.draggingIn = true;
this.draggingItem = payload;
},
// onDrag({ isSource, payload, willAcceptDrop }) {
// this.enablePopup = false;
// this.draggingIn = true;
// this.draggingItem = payload;
// },
onDragEnd() {
this.draggingIn = false;
// this.draggingTool = null;
},
// onDragEnd({ isSource, payload, willAcceptDrop }) {
// this.draggingIn = false;
// this.draggingItem = payload;
// },
onDragEnter(position) {
this.draggingPosition = position;
@@ -136,13 +135,14 @@ export default {
if(event.payload && event.payload.status != 1 && event.payload.status != 3 && event.addedIndex != event.removedIndex){
this.draggingIn = false;
this.draggingItem = null;
var itemsPositions = {objectId: event.payload.id, newPosition: event.addedIndex};
await new FileService().moveItemsQueue(this.selectedProcess,itemsPositions,this.partPrograms).then(function(){
response = true;
});
if(response && event.addedIndex && event.removeIndex){
this.partPrograms.splice(event.addedIndex, 0, this.partPrograms.splice(event.removedIndex,1)[0]);
}
var itemsPositions = {objectId: event.payload.id, newPosition: event.addedIndex, oldPosition: event.removedIndex};
await new FileService().moveItemsQueue(this.selectedProcess,itemsPositions,this.partPrograms);
// .then(function(){
// response = true;
// });
// if(response && event.addedIndex && event.removeIndex){
// this.partPrograms.splice(event.addedIndex, 0, this.partPrograms.splice(event.removedIndex,1)[0]);
// }
}
else{
event = null;
Step/wwwroot/src/services/fileService.ts
+4 -5
View File
@@ -36,15 +36,15 @@ export class FileService extends baseRestService {
}
async deleteItemQueue(processId, model){
debugger
var result = await this.Delete<any>(this.BASE_URL + "queue/" + processId + "/remove/" + model.id, true);
productionActions.deletePartProgram(store,model);
return result;
}
async moveItemsQueue(processId, itemsPositions, model){
var result = await this.Put<any>(this.BASE_URL + "queue/" + processId + "/move", itemsPositions, true);
productionActions.movePartPrograms(store,result);
async moveItemsQueue(processId, position, model){
var result = await this.Put<any>(this.BASE_URL + "queue/" + processId + "/move", position, true);
model = result;
productionActions.movePartProgram(store,{model,position});
return result;
}
@@ -59,7 +59,6 @@ export class FileService extends baseRestService {
}
async changeReps(processId,model){
debugger
var result = await this.Put<any>(this.BASE_URL + "queue/" + processId + "/edit/" + model.id, {reps: model.reps});
productionActions.updatePartProgram(store, result);
return result;
Step/wwwroot/src/services/toolingService.ts
+1
View File
@@ -75,6 +75,7 @@ export class ToolingService extends baseRestService {
toolingActions.setToolsPerMultitools(store, result.maxToolsPerMultitools);
toolingActions.setMultitoolOptionActive(store, result.multitoolOptionActive);
toolingActions.setFamilyOptionActive(store, result.familyOptionActive);
toolingActions.setOffsetOptionActive(store, result.offsetOptionActive);
toolingActions.setMagPositionOptionActive(store, result.magPositionOptionActive);
toolingActions.updateToolsConfigurations(store, result.toolsConfiguration);
toolingActions.updateMagazinePosConfigurations(
Step/wwwroot/src/store/production.store.ts
+31 -11
View File
@@ -11,7 +11,8 @@ export interface ProductionActions {
updatePartPrograms(context, model:server.PartProgramModel[]);
deletePartPrograms(context);
deletePartProgram(context, model:server.PartProgramModel);
movePartPrograms(context, model:server.PartProgramModel[]);
movePartPrograms(context, model:server.PartProgramModel[]);
movePartProgram(context, {model,position});
}
export const productionStore = {
@@ -23,24 +24,39 @@ export const productionStore = {
},
mutations: {
UpdatePartProgram(store, model: server.PartProgramModel) {
debugger
store._partProgram.set(model.id, model);
store.partProgram = Array.from(store._partProgram.values());
},
UpdatePartPrograms(store, model: server.PartProgramModel[]){
store._partProgram.clear();
store.partProgram = [];
for(const key in model){
const element = model[key];
store._partProgram.set(element.id,element);
store.partProgram = Array.from(store._partProgram.values());
}
},
DeletePartPrograms(store) {
store.partProgram = [];
},
DeletePartProgram(store, model:server.PartProgramModel) {
debugger
let idx = store.partProgram.indexOf(model);
if(store.partProgram[idx] && model && store.partProgram[idx].id == model.id){
store.partProgram.splice(idx,1);
}
// store._partProgram.delete(model.id);
// store.partProgram = Array.from(store._partProgram.values());
// let idx = store.partProgram.indexOf(model);
// if(store.partProgram[idx] && model && store.partProgram[idx].id == model.id){
// store.partProgram.splice(idx,1);
// }
store._partProgram.delete(model.id);
store.partProgram = Array.from(store._partProgram.values());
},
MovePartPrograms(store, model:server.PartProgramModel[]) {
store.partProgram = model;
store.partProgram = [];
store.partProgram = model;
},
MovePartProgram(store, {model,position}) {
if(position){
var model = store.partProgram.splice(position.oldPosition, 1)[0];
store.partProgram.splice(position.newPosition, 0, model);
// store.partProgram.splice(position.newPosition, 0, store.partProgram.splice(position.oldPosition,1)[0]);
}
}
},
actions: {
@@ -48,10 +64,14 @@ export const productionStore = {
context.commit("UpdatePartProgram", model);
},
updatePartPrograms(context, model:server.PartProgramModel[]) {
context.commit("MovePartPrograms", model);
context.commit("UpdatePartPrograms", model);
// context.commit("MovePartPrograms", model);
},
movePartPrograms(context, model:server.PartProgramModel[]) {
context.commit("MovePartPrograms", model);
},
movePartProgram(context, {model,position}) {
context.commit("MovePartProgram", {model,position});
},
deletePartProgram(context, model:server.PartProgramModel) {
context.commit("DeletePartProgram", model);
Step/wwwroot/src/store/tooling.store.ts
+10 -1
View File
@@ -30,6 +30,7 @@ export interface ToolingStoreModel {
multitoolOptionActive: boolean
familyOptionActive: boolean
magPositionOptionActive: boolean
offsetOptionActive: boolean
}
export interface ToolingGetters{
@@ -98,6 +99,7 @@ export interface ToolingActions {
setToolsPerMultitools(context, number);
setMultitoolOptionActive(context, multitoolOptionActive: boolean);
setFamilyOptionActive(context, familyOptionActive: boolean);
setOffsetOptionActive(context, offsetOptionActive: boolean);
setMagPositionOptionActive(context, magPositionOptionActive: boolean);
}
@@ -147,7 +149,8 @@ export const toolingStore = {
maxToolsPerMultitools: 0,
multitoolOptionActive: false,
familyOptionActive: false,
magPositionOptionActive: false
magPositionOptionActive: false,
offsetOptionActive: false
} as ToolingStoreModel,
getters:{
toolIsInWarning : (state) => (id) : boolean =>{
@@ -398,6 +401,9 @@ export const toolingStore = {
SetFamilyOptionActive(store, familyOptionActive){
store.familyOptionActive = familyOptionActive;
},
SetOffsetOptionActive(store, offsetOptionActive){
store.offsetOptionActive = offsetOptionActive;
},
SetMagPositionOptionActive(store, magPositionOptionActive){
store.magPositionOptionActive = magPositionOptionActive;
},
@@ -427,6 +433,9 @@ export const toolingStore = {
setFamilyOptionActive(context, familyOptionActive: boolean){
context.commit("SetFamilyOptionActive", familyOptionActive);
},
setOffsetOptionActive(context, offsetOptionActive: boolean){
context.commit("SetOffsetOptionActive", offsetOptionActive);
},
setMagPositionOptionActive(context, magPositionOptionActive: boolean){
context.commit("SetMagPositionOptionActive", magPositionOptionActive);
},