conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
? <primitive object={mesh}>
<mesh name={'cursor'} visible={false}>
=======
? <group>
<primitive object={mesh} />
<mesh name={'cursor'} visible={true/*false*/}>
>>>>>>>
? <group>
<primitive object={mesh} />
<mesh name={'cursor'} visible={false}> |
<<<<<<<
const translateTooltip = (elementName, traslationKey) => {
let element = document.querySelector(elementName)
if(!element) return
element.setAttribute("data-tooltip-title", i18n.t(`${traslationKey}.title`))
element.setAttribute("data-tooltip-description", i18n.t(`${traslationKey}.description`))
}
=======
const SettingsService = require("../windows/shot-generator/SettingsService")
>>>>>>>
const translateTooltip = (elementName, traslationKey) => {
let element = document.querySelector(elementName)
if(!element) return
element.setAttribute("data-tooltip-title", i18n.t(`${traslationKey}.title`))
element.setAttribute("data-tooltip-description", i18n.t(`${traslationKey}.description`))
}
const SettingsService = require("../windows/shot-generator/SettingsService") |
<<<<<<<
var EditorSidebarView = require('coreJS/editor/views/editorSidebarView');
var EditorMenuView = require('coreJS/editor/views/editorMenuView');
var EditorContentObjectsCollection = require('coreJS/editor/collections/editorContentObjectsCollection');
=======
var PageView = require('coreJS/editor/views/pageView');
var PageCollection = require('coreJS/editor/collections/pageCollection');
var PageModel = require('coreJS/editor/models/pageModel');
>>>>>>>
var EditorSidebarView = require('coreJS/editor/views/editorSidebarView');
var EditorMenuView = require('coreJS/editor/views/editorMenuView');
var EditorContentObjectsCollection = require('coreJS/editor/collections/editorContentObjectsCollection');
var PageView = require('coreJS/editor/views/pageView');
var PageCollection = require('coreJS/editor/collections/pageCollection');
var PageModel = require('coreJS/editor/models/pageModel');
<<<<<<<
initialize: function(options) {
this.currentView = options.currentView;
this.listenTo(this.model, 'sync', this.render);
=======
events: {
"click a.page-add-link" : "addNewPage",
"click a.load-page" : "loadPage",
},
addNewPage: function(event) {
event.preventDefault();
console.log('Adding new page');
Backbone.history.navigate('/page/new/' + this.model.get('_id'), {trigger: true});
},
preRender: function() {
>>>>>>>
events: {
"click a.page-add-link" : "addNewPage",
"click a.load-page" : "loadPage",
},
// postRender: function() {
// this.renderEditorSidebar();
// if (this.currentView === "menu") {
// this.renderEditorMenu();
// }
// },
renderEditorSidebar: function() {
this.$el.append(new EditorSidebarView().$el);
},
renderEditorMenu: function() {
this.$('.editor-inner').html(new EditorMenuView({
model: this.model,
collection: new EditorContentObjectsCollection({
url: '/data/contentObjects.json'
})
}).$el);
// 'api/content/' + this.model.get('_id') + '/articles'
},
renderEditorPage: function() {
console.log('render editor page');
},
addNewPage: function(event) {
event.preventDefault();
console.log('Adding new page');
Backbone.history.navigate('/page/new/' + this.model.get('_id'), {trigger: true});
},
preRender: function() {
this.listenTo(this.model, 'sync', this.dataLoaded); |
<<<<<<<
const findParent = obj => {
while (obj) {
if (!obj.parent || obj.parent.type === 'Scene') {
return obj
}
obj = obj.parent
}
return null
}
const GUI = ({ aspectRatio, guiMode, addMode, currentBoard, selectedObject, hideArray, virtualCamVisible, flipHand, guiCamFOV, vrControllers }) => {
=======
const GUI = ({ aspectRatio, guiMode, addMode, currentBoard, selectedObject, hideArray, virtualCamVisible, guiCamFOV, vrControllers }) => {
>>>>>>>
const GUI = ({ aspectRatio, guiMode, addMode, currentBoard, selectedObject, hideArray, virtualCamVisible, flipHand, guiCamFOV, vrControllers }) => { |
<<<<<<<
//console.log('weird: ', weirdFBThingie)
let bonesHelper = new BonesHelper( skeleton.bones[0].parent, object.current, { boneLengthScale } )
=======
let bonesHelper = new BonesHelper( skeleton.bones[0].parent, object.current )
bonesHelper.traverse(child => {
child.layers.disable(0)
child.layers.enable(1)
child.layers.enable(2)
})
bonesHelper.hit_meshes.forEach(h => {
h.layers.disable(0)
h.layers.enable(1)
h.layers.enable(2)
})
bonesHelper.cones.forEach(c => {
c.layers.disable(0)
c.layers.enable(1)
c.layers.enable(2)
})
>>>>>>>
let bonesHelper = new BonesHelper( skeleton.bones[0].parent, object.current, { boneLengthScale } )
bonesHelper.traverse(child => {
child.layers.disable(0)
child.layers.enable(1)
child.layers.enable(2)
})
bonesHelper.hit_meshes.forEach(h => {
h.layers.disable(0)
h.layers.enable(1)
h.layers.enable(2)
})
bonesHelper.cones.forEach(c => {
c.layers.disable(0)
c.layers.enable(1)
c.layers.enable(2)
}) |
<<<<<<<
label: i18n.t('menu.help.bug-submit'),
=======
type: 'separator'
},
{
label: 'Found a bug? Submit an issue!!!',
>>>>>>>
type: 'separator'
},
{
label: i18n.t('menu.help.bug-submit'),
<<<<<<<
label: i18n.t('menu.file.import-image-and-replace'),
=======
label: 'Replace Reference Layer Image…',
>>>>>>>
label: i18n.t('menu.file.import-image-and-replace'),
<<<<<<<
label: i18n.t('menu.view.actual-size'),
=======
label: 'Canvas: Actual Size',
>>>>>>>
label: i18n.t('menu.view.actual-size'),
<<<<<<<
label: i18n.t('menu.view.zoom-in'),
accelerator: keystrokeFor("menu:view:zoom-in"),
=======
label: 'UI: Scale Up',
accelerator: 'CommandOrControl+=',
>>>>>>>
label: i18n.t('menu.view.zoom-in'),
accelerator: keystrokeFor("menu:view:zoom-in"),
<<<<<<<
label: i18n.t('menu.view.zoom-out'),
=======
label: 'UI: Scale Down',
>>>>>>>
label: i18n.t('menu.view.zoom-out'),
<<<<<<<
label: i18n.t('menu.file.export-glTF'),
=======
label: 'Export glTF…',
>>>>>>>
label: i18n.t('menu.file.export-glTF'),
<<<<<<<
label: i18n.t('menu.view.scale-ui-up'),
=======
label: 'UI: Scale Up',
>>>>>>>
label: i18n.t('menu.view.scale-ui-up'),
<<<<<<<
label: i18n.t('menu.view.scale-ui-down'),
=======
label: 'UI: Scale Down',
>>>>>>>
label: i18n.t('menu.view.scale-ui-down'),
<<<<<<<
label: i18n.t('menu.view.reset-ui-scale'),
=======
label: 'UI: Reset Scale to 100%',
>>>>>>>
label: i18n.t('menu.view.reset-ui-scale'), |
<<<<<<<
=======
import CameraControlsComponent from './CameraControlsComponet'
>>>>>>>
import CameraControlsComponent from './CameraControlsComponet'
<<<<<<<
useMemo(() => {
if(dragTarget && dragTarget.target){
=======
useEffect(() => {
if(dragTarget){
>>>>>>>
useMemo(() => {
if(dragTarget && dragTarget.target){
<<<<<<<
if (shouldDrag) {
setDragTarget({ target, x, y, isObjectControl: target.isRotated })
}
else {
cameraControlsView.current.onPointerDown(event)
}
=======
if (shouldDrag) {
setDragTarget({ target, x, y })
}
else {
setOnPointDown(event)
}
>>>>>>>
if (shouldDrag) {
setDragTarget({ target, x, y, isObjectControl: target.isRotated })
}
else {
setOnPointDown(event)
} |
<<<<<<<
characterIds, modelObjectIds, lightIds, virtualCameraIds
=======
characterIds, modelObjectIds, virtualCameraIds,
resources, getAsset
>>>>>>>
characterIds, modelObjectIds, lightIds, virtualCameraIds,
resources, getAsset |
<<<<<<<
const isIkCharacter = useRef(null)
=======
>>>>>>>
const isIkCharacter = useRef(null)
<<<<<<<
isIkCharacter.current = isSuitableForIk(skeleton)
=======
>>>>>>>
isIkCharacter.current = isSuitableForIk(skeleton) |
<<<<<<<
//const AttachableInfo = require('./attachables/AttachableInfo')
const AttachableInfo = require('./components/AttachableInfo').default
const HandPresetsEditor = require('./HandPresetsEditor')
=======
const AttachableInfo = require('./attachables/AttachableInfo')
const HandPresetsEditor = require('./components/HandPresetsEditor').default
>>>>>>>
const AttachableInfo = require('./components/AttachableInfo').default
const HandPresetsEditor = require('./components/HandPresetsEditor').default |
<<<<<<<
<spotLight
ref={light_spot}
color={0xffffff}
intensity={props.intensity}
position={[0, 0, 0]}
rotation={[Math.PI / 2, 0, 0]}
angle={props.angle}
distance={props.distance}
penumbra={props.penumbra}
decay={props.decay}
/>
<mesh ref={box_light_mesh} name="hitter_light" userData={{ type: 'hitter_light' }}>
<cylinderBufferGeometry attach="geometry" args={[0.0, 0.05, 0.14]} />
<meshLambertMaterial attach="material" color={0xffff66} />
</mesh>
{props.children}
=======
<group rotation={[Math.PI / 2, 0, 0]}>
<spotLight
ref={light_spot}
color={0xffffff}
intensity={props.intensity}
position={[0, 0, 0]}
rotation={[Math.PI / 2, 0, 0]}
angle={props.angle}
distance={props.distance}
penumbra={props.penumbra}
decay={props.decay}
/>
<mesh ref={box_light_mesh} name="hitter_light" userData={{ type: 'hitter_light' }}>
<cylinderBufferGeometry attach="geometry" args={[0.0, 0.05, 0.14]} />
<meshLambertMaterial attach="material" color={0xffff66} />
</mesh>
</group>
>>>>>>>
<group rotation={[Math.PI / 2, 0, 0]}>
<spotLight
ref={light_spot}
color={0xffffff}
intensity={props.intensity}
position={[0, 0, 0]}
rotation={[Math.PI / 2, 0, 0]}
angle={props.angle}
distance={props.distance}
penumbra={props.penumbra}
decay={props.decay}
/>
<mesh ref={box_light_mesh} name="hitter_light" userData={{ type: 'hitter_light' }}>
<cylinderBufferGeometry attach="geometry" args={[0.0, 0.05, 0.14]} />
<meshLambertMaterial attach="material" color={0xffff66} />
{props.children}
</mesh>
</group> |
<<<<<<<
import FaceMesh from "./Helpers/FaceMesh"
=======
let boneWorldPosition = new THREE.Vector3()
let worldPositionHighestBone = new THREE.Vector3()
const findHighestBone = (object) =>
{
let highestBone = null
let bones = object.skeleton.bones
for(let i = 0; i < bones.length; i ++)
{
let bone = bones[i]
if(!highestBone)
{
highestBone = bone
continue
}
bone.getWorldPosition(boneWorldPosition)
highestBone.getWorldPosition(worldPositionHighestBone)
if(boneWorldPosition.y > worldPositionHighestBone.y)
{
highestBone = bone
}
}
return highestBone
}
>>>>>>>
import FaceMesh from "./Helpers/FaceMesh"
let boneWorldPosition = new THREE.Vector3()
let worldPositionHighestBone = new THREE.Vector3()
const findHighestBone = (object) =>
{
let highestBone = null
let bones = object.skeleton.bones
for(let i = 0; i < bones.length; i ++)
{
let bone = bones[i]
if(!highestBone)
{
highestBone = bone
continue
}
bone.getWorldPosition(boneWorldPosition)
highestBone.getWorldPosition(worldPositionHighestBone)
if(boneWorldPosition.y > worldPositionHighestBone.y)
{
highestBone = bone
}
}
return highestBone
} |
<<<<<<<
const { useMemo, useState, useRef, useEffect } = React = require('react')
=======
const { useMemo, useRef } = React = require('react')
>>>>>>>
const { useMemo, useRef, useEffect } = React = require('react')
<<<<<<<
=======
const canUndo = useSelector(state => state.undoable.past.length > 0)
const canRedo = useSelector(state => state.undoable.future.length > 0)
>>>>>>>
const canUndo = useSelector(state => state.undoable.past.length > 0)
const canRedo = useSelector(state => state.undoable.future.length > 0) |
<<<<<<<
this.listenTo(Origin, 'assetItemView:previewUpload', this.showUploadPreview);
this.listenTo(Origin, 'assetManagement:filter', this.filterCollection);
},
setupFilteredCollection: function() {
this.filteredCollection = new Backbone.Collection(this.collection.models);
this.addAssetViews();
=======
$(window).on('resize', this.setCollectionHeight);
>>>>>>>
this.listenTo(Origin, 'assetManagement:filter', this.filterCollection);
},
setupFilteredCollection: function() {
this.filteredCollection = new Backbone.Collection(this.collection.models);
this.addAssetViews();
$(window).on('resize', this.setCollectionHeight); |
<<<<<<<
text: calculatedName,
=======
storyboarderFilePath: meta.storyboarderFilePath,
// HACK force reset skeleton pose on Board UUID change
boardUid: _boardUid,
>>>>>>>
text: calculatedName,
storyboarderFilePath: meta.storyboarderFilePath,
// HACK force reset skeleton pose on Board UUID change
boardUid: _boardUid, |
<<<<<<<
const Character = React.memo(({ path, sceneObject, modelSettings, isSelected, selectedBone, updateCharacterSkeleton, updateCharacterIkSkeleton }) => {
const {asset: gltf, loaded} = useAsset(path)
const ref = useUpdate(
self => {
let lod = self.getObjectByProperty("type", "LOD")
lod && lod.traverse(child => child.layers.enable(SHOT_LAYERS))
}
)
=======
const Character = React.memo(({ gltf, sceneObject, modelSettings, isSelected, selectedBone, updateCharacterSkeleton, updateCharacterIkSkeleton }) => {
const ref = useUpdate(
self => {
let lod = self.getObjectByProperty("type", "LOD") || self
lod && lod.traverse(child => child.layers.enable(SHOT_LAYERS))
}
)
>>>>>>>
const Character = React.memo(({ path, sceneObject, modelSettings, isSelected, selectedBone, updateCharacterSkeleton, updateCharacterIkSkeleton }) => {
const {asset: gltf, loaded} = useAsset(path)
const ref = useUpdate(
self => {
let lod = self.getObjectByProperty("type", "LOD") || self
lod && lod.traverse(child => child.layers.enable(SHOT_LAYERS))
}
)
<<<<<<<
const [skeleton, lod, originalSkeleton, armature, originalHeight] = useMemo(() => {
if(!gltf) {
setReady(false)
return [null, null, null, null, null]
}
let lod = new THREE.LOD()
let { scene } = cloneGltf(gltf)
let map
// for built-in Characters
// SkinnedMeshes are immediate children
let meshes = scene.children.filter(child => child.isSkinnedMesh)
// if no SkinnedMeshes are found there, this may be a custom model file
if (meshes.length === 0 && scene.children.length && scene.children[0].children) {
// try to find the first SkinnedMesh in the first child object's children
let mesh = scene.children[0].children.find(child => child.isSkinnedMesh)
if (mesh) {
meshes = [mesh]
}
}
// if there's only 1 mesh
let startAt = meshes.length == 1
// start at mesh index 0 (for custom characters)
? 0
// otherwise start at mesh index 1 (for built-in characters)
: 1
for (let i = startAt, d = 0; i < meshes.length; i++, d++) {
let mesh = meshes[i]
mesh.matrixAutoUpdate = false
map = mesh.material.map
mesh.material = new THREE.MeshToonMaterial({
map: map,
color: 0xffffff,
emissive: 0x0,
specular: 0x0,
reflectivity: 0x0,
skinning: true,
shininess: 0,
flatShading: false,
morphNormals: true,
morphTargets: true
})
lod.addLevel(mesh, d * 4)
}
let skeleton = lod.children[0].skeleton
skeleton.pose()
let originalSkeleton = skeleton.clone()
originalSkeleton.bones = originalSkeleton.bones.map(bone => bone.clone())
let armature = scene.children[0].children[0]
let originalHeight
if (isUserModel(sceneObject.model)) {
originalHeight = 1
} else {
let bbox = new THREE.Box3().setFromObject(lod)
originalHeight = bbox.max.y - bbox.min.y
}
// We need to override skeleton when model is changed because in store skeleton position is still has values for prevModel
setReady(true)
return [skeleton, lod, originalSkeleton, armature, originalHeight]
}, [gltf])
=======
const [skeleton, lod, originalSkeleton, armature, originalHeight] = useMemo(
() => {
if(!gltf) {
setReady(false)
return [null, null, null, null, null]
}
let lod = new THREE.LOD()
let { scene } = cloneGltf(gltf)
let map
// for built-in Characters
// SkinnedMeshes are immediate children
let meshes = scene.children.filter(child => child.isSkinnedMesh)
// if no SkinnedMeshes are found there, this may be a custom model file
if (meshes.length === 0 && scene.children.length && scene.children[0].children) {
// try to find the first SkinnedMesh in the first child object's children
let mesh = scene.children[0].children.find(child => child.isSkinnedMesh)
if (mesh) {
meshes = [mesh]
}
}
// if there's only 1 mesh
let startAt = meshes.length == 1
// start at mesh index 0 (for custom characters)
? 0
// otherwise start at mesh index 1 (for built-in characters)
: 1
for (let i = startAt, d = 0; i < meshes.length; i++, d++) {
let mesh = meshes[i]
mesh.matrixAutoUpdate = false
map = mesh.material.map
mesh.material = new THREE.MeshToonMaterial({
map: map,
color: 0xffffff,
emissive: 0x0,
specular: 0x0,
reflectivity: 0x0,
skinning: true,
shininess: 0,
flatShading: false,
morphNormals: true,
morphTargets: true
})
lod.addLevel(mesh, d * 4)
}
let skeleton = lod.children[0].skeleton
skeleton.pose()
let originalSkeleton = skeleton.clone()
originalSkeleton.bones = originalSkeleton.bones.map(bone => bone.clone())
let armature = scene.getObjectByProperty("type", "Bone").parent
let originalHeight
if (isUserModel(sceneObject.model)) {
originalHeight = 1
} else {
let bbox = new THREE.Box3().setFromObject(lod)
originalHeight = bbox.max.y - bbox.min.y
}
// We need to override skeleton when model is changed because in store skeleton position is still has values for prevModel
setReady(true)
return [skeleton, lod, originalSkeleton, armature, originalHeight]
}, [gltf])
>>>>>>>
const [skeleton, lod, originalSkeleton, armature, originalHeight] = useMemo(() => {
if(!gltf) {
setReady(false)
return [null, null, null, null, null]
}
let lod = new THREE.LOD()
let { scene } = cloneGltf(gltf)
let map
// for built-in Characters
// SkinnedMeshes are immediate children
let meshes = scene.children.filter(child => child.isSkinnedMesh)
// if no SkinnedMeshes are found there, this may be a custom model file
if (meshes.length === 0 && scene.children.length && scene.children[0].children) {
// try to find the first SkinnedMesh in the first child object's children
let mesh = scene.children[0].children.find(child => child.isSkinnedMesh)
if (mesh) {
meshes = [mesh]
}
}
// if there's only 1 mesh
let startAt = meshes.length == 1
// start at mesh index 0 (for custom characters)
? 0
// otherwise start at mesh index 1 (for built-in characters)
: 1
for (let i = startAt, d = 0; i < meshes.length; i++, d++) {
let mesh = meshes[i]
mesh.matrixAutoUpdate = false
map = mesh.material.map
mesh.material = new THREE.MeshToonMaterial({
map: map,
color: 0xffffff,
emissive: 0x0,
specular: 0x0,
reflectivity: 0x0,
skinning: true,
shininess: 0,
flatShading: false,
morphNormals: true,
morphTargets: true
})
lod.addLevel(mesh, d * 4)
}
let skeleton = lod.children[0].skeleton
skeleton.pose()
let originalSkeleton = skeleton.clone()
originalSkeleton.bones = originalSkeleton.bones.map(bone => bone.clone())
let armature = scene.getObjectByProperty("type", "Bone").parent
let originalHeight
if (isUserModel(sceneObject.model)) {
originalHeight = 1
} else {
let bbox = new THREE.Box3().setFromObject(lod)
originalHeight = bbox.max.y - bbox.min.y
}
// We need to override skeleton when model is changed because in store skeleton position is still has values for prevModel
setReady(true)
return [skeleton, lod, originalSkeleton, armature, originalHeight]
}, [gltf]) |
<<<<<<<
// If undefined, the path will be /tmp/
config.erizoController.recording_path = undefined;
=======
// Max processes that ErizoAgent can run
config.erizoAgent.maxProcesses = 1;
// Number of precesses that ErizoAgent runs when it starts. Always lower than or equals to maxProcesses.
config.erizoAgent.prerunProcesses = 1;
>>>>>>>
// If undefined, the path will be /tmp/
config.erizoController.recording_path = undefined;
// Max processes that ErizoAgent can run
config.erizoAgent.maxProcesses = 1;
// Number of precesses that ErizoAgent runs when it starts. Always lower than or equals to maxProcesses.
config.erizoAgent.prerunProcesses = 1; |
<<<<<<<
if ((spec.audio || spec.video) && spec.url === undefined) {
L.Logger.debug("Requested access to local media");
Erizo.GetUserMedia({video: spec.video, audio: spec.audio}, function (stream) {
=======
if (spec.audio || spec.video || spec.screen) {
L.Logger.debug("Requested access to local media");
var opt = {video: spec.video, audio: spec.audio};
if (spec.screen) {
opt = {video:{mandatory: {chromeMediaSource: 'screen'}}};
}
Erizo.GetUserMedia(opt, function (stream) {
>>>>>>>
if ((spec.audio || spec.video || spec.screen) && spec.url === undefined) {
L.Logger.debug("Requested access to local media");
var opt = {video: spec.video, audio: spec.audio};
if (spec.screen) {
opt = {video:{mandatory: {chromeMediaSource: 'screen'}}};
}
Erizo.GetUserMedia(opt, function (stream) {
<<<<<<<
that.close = function () {
if (that.local) {
if (that.room !== undefined) {
that.room.unpublish(that);
}
// Remove HTML element
that.hide();
if (that.stream !== undefined) {
that.stream.stop();
}
that.stream = undefined;
}
};
that.show = function (elementID, options) {
=======
that.close = function () {
if (that.local) {
if (that.room !== undefined) {
that.room.unpublish(that);
}
// Remove HTML element
that.hide();
if (that.stream !== undefined) {
that.stream.stop();
}
that.stream = undefined;
}
};
that.show = function (elementID, options) {
>>>>>>>
that.close = function () {
if (that.local) {
if (that.room !== undefined) {
that.room.unpublish(that);
}
// Remove HTML element
that.hide();
if (that.stream !== undefined) {
that.stream.stop();
}
that.stream = undefined;
}
};
that.show = function (elementID, options) { |
<<<<<<<
import moment from 'moment';
import _ from 'lodash';
import { LOAD_DATABASES_SUCCESS } from '../constants/action-types';
=======
import { LODAD_DABATASES } from '../constants/action-types';
>>>>>>>
import { LOAD_DATABASES_SUCCESS } from '../constants/action-types'; |
<<<<<<<
import { makeStyles } from '@material-ui/core/styles'
const useStyles = makeStyles(theme => ({
drawerWidth: { width: 360 },
}))
=======
import { DragDropContext } from 'react-beautiful-dnd'
import { moveFunds } from './thunks'
import MoveMoneyModal from './containers/MoveMoneyModal'
>>>>>>>
import { makeStyles } from '@material-ui/core/styles'
import { DragDropContext } from 'react-beautiful-dnd'
import { moveFunds } from './thunks'
import MoveMoneyModal from './containers/MoveMoneyModal'
const useStyles = makeStyles(theme => ({
drawerWidth: { width: 360 },
}))
<<<<<<<
const [month, setMonth] = useState(+startOfMonth(new Date()))
const [openDrawer, setOpenDrawer] = useState(false)
const c = useStyles()
=======
const [month, setMonth] = React.useState(+startOfMonth(new Date()))
const [moneyModalProps, setMoneyModalProps] = React.useState({ open: false })
>>>>>>>
const [month, setMonth] = useState(+startOfMonth(new Date()))
const [openDrawer, setOpenDrawer] = useState(false)
const [moneyModalProps, setMoneyModalProps] = useState({ open: false })
const c = useStyles()
<<<<<<<
<Box p={isMobile ? 1 : 3} display="flex">
<Box flexGrow="1">
<Grid container spacing={3}>
{/* <Grid item xs={12} md={4}>
<MonthSelector
months={monthDates}
current={index}
onSetCurrent={setCurrentMonth}
onChange={setMonthByIndex}
/>
</Grid> */}
{/* <Grid item xs={12} md={4}>
<Box component={BudgetInfo} index={index} mt={3} />
</Grid> */}
{/* <Hidden smDown>
<Box component={AccountList} mt={3} />
</Hidden> */}
<Grid item xs={12} md={12}>
<TagTable index={index} date={monthDates[index]} />
<Box component={TransferTable} index={index} mt={3} />
</Grid>
</Grid>
</Box>
<Drawer
classes={
isMobile ? null : { paper: c.drawerWidth, root: c.drawerWidth }
}
variant={isMobile ? 'temporary' : 'persistent'}
anchor="right"
open={!isMobile || !!openDrawer}
onClose={() => setOpenDrawer(false)}
>
<Box display="flex" flexDirection="column" minHeight="100vh" p={3}>
<MonthSelector
months={monthDates}
current={index}
onSetCurrent={setCurrentMonth}
onChange={setMonthByIndex}
/>
<Box pt={2} />
<BudgetInfo index={index} />
<Box pt={2} />
</Box>
</Drawer>
</Box>
=======
<DragDropContext
onDragEnd={moveMoney}
onDragStart={() => {
if (window.navigator.vibrate) {
window.navigator.vibrate(100)
}
}}
>
<Box p={isMobile ? 1 : 3}>
<MoveMoneyModal
{...moneyModalProps}
onClose={() => setMoneyModalProps({ open: false })}
/>
<Grid container spacing={3}>
<Grid item xs={12} md={3}>
<MonthSelector
months={monthDates}
current={index}
onSetCurrent={setCurrentMonth}
onChange={setMonthByIndex}
/>
<Box component={BudgetInfo} index={index} mt={3} />
<Hidden smDown>
<Box component={AccountList} mt={3} />
</Hidden>
</Grid>
<Grid item xs={12} md={9}>
<TagTable index={index} date={monthDates[index]} />
<Box component={TransferTable} index={index} mt={3} />
</Grid>
</Grid>
</Box>
</DragDropContext>
>>>>>>>
<DragDropContext
onDragEnd={moveMoney}
onDragStart={() => {
if (window.navigator.vibrate) {
window.navigator.vibrate(100)
}
}}
>
<Box p={isMobile ? 1 : 3} display="flex">
<MoveMoneyModal
{...moneyModalProps}
onClose={() => setMoneyModalProps({ open: false })}
/>
<Box flexGrow="1">
<Grid container spacing={3}>
{/*
<Grid item xs={12} md={3}>
<MonthSelector
months={monthDates}
current={index}
onSetCurrent={setCurrentMonth}
onChange={setMonthByIndex}
/>
</Grid> */}
{/* <Grid item xs={12} md={4}>
<Box component={BudgetInfo} index={index} mt={3} />
</Grid> */}
{/* <Hidden smDown>
<Box component={AccountList} mt={3} />
</Hidden> */}
<Grid item xs={12} md={12}>
<TagTable index={index} date={monthDates[index]} />
<Box component={TransferTable} index={index} mt={3} />
</Grid>
</Grid>
</Box>
<Drawer
classes={
isMobile ? null : { paper: c.drawerWidth, root: c.drawerWidth }
}
variant={isMobile ? 'temporary' : 'persistent'}
anchor="right"
open={!isMobile || !!openDrawer}
onClose={() => setOpenDrawer(false)}
>
<Box display="flex" flexDirection="column" minHeight="100vh" p={3}>
<MonthSelector
months={monthDates}
current={index}
onSetCurrent={setCurrentMonth}
onChange={setMonthByIndex}
/>
<Box pt={2} />
<BudgetInfo index={index} />
<Box pt={2} />
</Box>
</Drawer>
</Box>
</DragDropContext> |
<<<<<<<
this.client.messages.push(`${chalk.gray(line)}`)
=======
this.state.messages.push(`${chalk.dim(line)}`)
>>>>>>>
this.client.messages.push(`${chalk.dim(line)}`)
<<<<<<<
self.client.scrollback = 0
self.client.messages = []
=======
self.state.scrollback = 0
self.state.messages = []
self.state.topic = ''
>>>>>>>
self.client.scrollback = 0
self.client.messages = []
self.state.topic = ''
<<<<<<<
var timestamp = `${chalk.gray(formatTime(msg.value.timestamp))}`
var authorText = `${chalk.gray('<')}${highlight ? chalk.whiteBright(author) : chalk[color](author)}${chalk.gray('>')}`
=======
var timestamp = `${chalk.dim(formatTime(msg.value.timestamp))}`
var authorText = `${chalk.dim('<')}${chalk[color](author)}${chalk.dim('>')}`
>>>>>>>
var timestamp = `${chalk.dim(formatTime(msg.value.timestamp))}`
var authorText = `${chalk.dim('<')}${highlight ? chalk.whiteBright(author) : chalk[color](author)}${chalk.dim('>')}` |
<<<<<<<
self.state.cabal.client.messages.push(self.formatMessage(msg))
=======
var msgDate = new Date(msg.value.timestamp)
if (strftime('%F', msgDate) > strftime('%F', self.state.latest_date)) {
self.state.latest_date = msgDate
self.state.messages.push(`${chalk.gray('day changed to ' + strftime('%e %b %Y', self.state.latest_date))}`)
}
self.state.messages.push(self.formatMessage(msg))
>>>>>>>
var msgDate = new Date(msg.value.timestamp)
if (strftime('%F', msgDate) > strftime('%F', self.state.latest_date)) {
self.state.latest_date = msgDate
self.state.cabal.messages.push(`${chalk.gray('day changed to ' + strftime('%e %b %Y', self.state.latest_date))}`)
self.state.cabal.client.messages.push(self.formatMessage(msg))
}
self.state.cabal.client.messages.push(self.formatMessage(msg))
<<<<<<<
var user = self.state.cabal.username
=======
>>>>>>> |
<<<<<<<
toggleEditorTextSize,
=======
repoExportDisplayed,
repoExportNotDisplayed,
>>>>>>>
repoExportDisplayed,
repoExportNotDisplayed,
toggleEditorTextSize, |
<<<<<<<
import spinnerPageHtml from '../../../templates/project-export.html';
import generatePreview from '../../../src/util/generatePreview';
=======
import spinnerPageHtml from '../../../templates/github-export.html';
import compileProject from '../../../src/util/compileProject';
>>>>>>>
import spinnerPageHtml from '../../../templates/project-export.html';
import compileProject from '../../../src/util/compileProject'; |
<<<<<<<
getRequestedFocusedLine,
=======
isCurrentProjectSyntacticallyValid,
>>>>>>>
getRequestedFocusedLine,
isCurrentProjectSyntacticallyValid,
<<<<<<<
requestedFocusedLine: getRequestedFocusedLine(state),
=======
showingErrors: !isCurrentProjectSyntacticallyValid(state),
>>>>>>>
requestedFocusedLine: getRequestedFocusedLine(state),
showingErrors: !isCurrentProjectSyntacticallyValid(state), |
<<<<<<<
import generatePreview from '../util/generatePreview';
import spinnerPageHtml from '../../templates/project-export.html';
=======
import compileProject from '../util/compileProject';
import spinnerPageHtml from '../../templates/github-export.html';
>>>>>>>
import spinnerPageHtml from '../../templates/project-export.html';
import compileProject from '../util/compileProject'; |
<<<<<<<
// .attr("transform", function(d) {
// if (!d.children) return "rotate(" + (d.x < 180 ? d.x - 90 : d.x + 90) + ")";
// return null;
// })
// .style('fill', 'darkblue');
=======
>>>>>>>
// .attr("transform", function(d) {
// if (!d.children) return "rotate(" + (d.x < 180 ? d.x - 90 : d.x + 90) + ")";
// return null;
// })
// .style('fill', 'darkblue'); |
<<<<<<<
html.should.equal('<p>Tobi</p>');
calls.should.equal(name === 'atpl' ? 4 : 2);
=======
html.should.match(/Tobi/);
calls.should.equal(2);
>>>>>>>
html.should.match(/Tobi/);
calls.should.equal(name === 'atpl' ? 4 : 2); |
<<<<<<<
const lib = require("../index");
const {Intersection, Point2D} = lib;
=======
let lib = require("../index"),
Intersection = lib.Intersection,
Point2D = lib.Point2D,
contours = require("kld-contours"),
CubicBezier2D = contours.CubicBezier2D;
>>>>>>>
const {Intersection, Point2D} = require("../index");
<<<<<<<
const intersectionSVG = result.points.map(p => {
return `<circle cx="${p.x.toFixed(3)}" cy="${p.y.toFixed(3)}" r="2" stroke="red" fill="none"/>`;
=======
let intersectionSVG = result.points.map(p => {
return `<circle cx="${p.x.toFixed(3)}" cy="${p.y.toFixed(3)}" r="2" stroke="red" fill="none"/>`;
>>>>>>>
const intersectionSVG = result.points.map(p => {
return `<circle cx="${p.x.toFixed(3)}" cy="${p.y.toFixed(3)}" r="2" stroke="red" fill="none"/>`; |
<<<<<<<
var uuid = $(e.currentTarget).data('uuid');
Workspace.openComponent({ uuid: uuid });
=======
var id = $(e.currentTarget).data('id');
var RealWorkspace = Workspace.openComponent ? Workspace : require('components/workspace/main');
RealWorkspace.openComponent({ uuid: id });
>>>>>>>
var id = $(e.currentTarget).data('id');
Workspace.openComponent({ uuid: id }); |
<<<<<<<
return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );
=======
if ( !relativeHierarchySelector || hasParent ) {
return makeArray( context.querySelectorAll( "#" + nid + " " + query ), extra );
}
>>>>>>>
if ( !relativeHierarchySelector || hasParent ) {
return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );
} |
<<<<<<<
=======
baseHasDuplicate = true,
document = window.document,
docElem = document.documentElement,
dirruns = 0,
done = 0,
>>>>>>>
<<<<<<<
=======
if ( document.querySelectorAll ) {
(function() {
var disconnectedMatch,
oldSelect = select,
rescape = /'|\\/g,
rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,
// qSa(:focus) reports false when true (Chrome 21), no need to also add to buggyMatches since matches checks buggyQSA
// A support test would require too much code (would include document ready)
rbuggyQSA = [ ":focus" ],
// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
// A support test would require too much code (would include document ready)
// just skip matchesSelector for :active
rbuggyMatches = [ ":active" ],
matches = docElem.matchesSelector ||
docElem.mozMatchesSelector ||
docElem.webkitMatchesSelector ||
docElem.oMatchesSelector ||
docElem.msMatchesSelector;
// Build QSA regex
// Regex strategy adopted from Diego Perini
assert(function( div ) {
// Select is set to empty string on purpose
// This is to test IE's treatment of not explictly
// setting a boolean content attribute,
// since its presence should be enough
// http://bugs.jquery.com/ticket/12359
div.innerHTML = "<select><option selected=''></option></select>";
// IE8 - Some boolean attributes are not treated correctly
if ( !div.querySelectorAll("[selected]").length ) {
rbuggyQSA.push( "\\[" + whitespace + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)" );
}
// Webkit/Opera - :checked should return selected option elements
// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
// IE8 throws error here and will not see later tests
if ( !div.querySelectorAll(":checked").length ) {
rbuggyQSA.push(":checked");
}
});
assert(function( div ) {
// Opera 10-12/IE9 - ^= $= *= and empty values
// Should not select anything
div.innerHTML = "<p test=''></p>";
if ( div.querySelectorAll("[test^='']").length ) {
rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:\"\"|'')" );
}
// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
// IE8 throws error here and will not see later tests
div.innerHTML = "<input type='hidden'/>";
if ( !div.querySelectorAll(":enabled").length ) {
rbuggyQSA.push( ":enabled", ":disabled" );
}
// Opera 10-11 does not throw on post-comma invalid pseudos
div.querySelectorAll("*,:x");
rbuggyQSA.push(",.*:");
});
rbuggyQSA = new RegExp( rbuggyQSA.join("|") );
select = function( selector, context, results, seed, xml ) {
// Only use querySelectorAll when not filtering,
// when this is not xml,
// and when no QSA bugs apply
if ( !seed && !xml && !rbuggyQSA.test( selector ) ) {
var groups, i,
old = true,
nid = expando,
newContext = context,
newSelector = context.nodeType === 9 && selector;
// qSA works strangely on Element-rooted queries
// We can work around this by specifying an extra ID on the root
// and working up from there (Thanks to Andrew Dupont for the technique)
// IE 8 doesn't work on object elements
if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
groups = tokenize( selector );
if ( (old = context.getAttribute("id")) ) {
nid = old.replace( rescape, "\\$&" );
} else {
context.setAttribute( "id", nid );
}
nid = "[id='" + nid + "'] ";
i = groups.length;
while ( i-- ) {
groups[i] = nid + toSelector( groups[i] );
}
newContext = rsibling.test( selector ) && context.parentNode || context;
newSelector = groups.join(",");
}
if ( newSelector ) {
try {
push.apply( results, slice.call( newContext.querySelectorAll(
newSelector
), 0 ) );
return results;
} catch(qsaError) {
} finally {
if ( !old ) {
context.removeAttribute("id");
}
}
}
}
return oldSelect( selector, context, results, seed, xml );
};
if ( matches ) {
assert(function( div ) {
// Check to see if it's possible to do matchesSelector
// on a disconnected node (IE 9)
disconnectedMatch = matches.call( div, "div" );
// This should fail with an exception
// Gecko does not error, returns false instead
matches.call( div, "[test!='']:x" );
rbuggyMatches.push( "!=", pseudos );
});
rbuggyMatches = new RegExp( rbuggyMatches.join("|") );
Sizzle.matchesSelector = function( elem, expr ) {
// Make sure that attribute selectors are quoted
expr = expr.replace( rattributeQuotes, "='$1']" );
// rbuggyMatches always contains :active, so no need for an existence check
if ( !isXML( elem ) && !rbuggyMatches.test( expr ) && !rbuggyQSA.test( expr ) ) {
try {
var ret = matches.call( elem, expr );
// IE 9's matchesSelector returns false on disconnected nodes
if ( ret || disconnectedMatch ||
// As well, disconnected nodes are said to be in a document
// fragment in IE 9
elem.document && elem.document.nodeType !== 11 ) {
return ret;
}
} catch(e) {}
}
return Sizzle( expr, null, null, [ elem ] ).length > 0;
};
}
})();
}
>>>>>>> |
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
=======
>>>>>>>
<<<<<<<
if ((course._isShared || course.createdBy == userId) && course._tenantId.toString() == tenantId) {
// Shared courses on the same tenant are open to users on the same tenant
return next(null, true);
}
return next(null, false);
} else {
return next(new Error('Course ' + courseId + ' not found'));
}
});
});
} else {
// Course permission cannot be verified
return next(null, false);
}
=======
if ((course._isShared || course.createdBy == userId) && course._tenantId.toString() == tenantId) {
// Shared courses on the same tenant are open to users on the same tenant
return next(null, true);
}
return next(null, false);
});
});
>>>>>>>
if ((course._isShared || course.createdBy == userId) && course._tenantId.toString() == tenantId) {
// Shared courses on the same tenant are open to users on the same tenant
return next(null, true);
}
return next(null, false);
});
});
<<<<<<<
/**
* Returns a slugified string, e.g. for use in a published filename
* Removes non-word/whitespace chars, converts to lowercase and replaces spaces with hyphens
* Multiple arguments are joined with spaces (and therefore hyphenated)
* @return {string}
**/
function slugify() {
var str = Array.apply(null,arguments).join(' ');
var strip_re = /[^\w\s-]/g;
var hyphenate_re = /[-\s]+/g;
str = str.replace(strip_re, '').trim()
str = str.toLowerCase();
str = str.replace(hyphenate_re, '-');
return str;
}
=======
function cloneObject(obj) {
var clone = {};
if(!obj) return clone;
Object.keys(obj).forEach(function(key) {
var prop = obj[key];
// type-specific copying
switch(Object.prototype.toString.call(prop).match(/\[object (.+)\]/)[1]) {
case 'Number':
clone[key] = Number(prop);
break;
case 'String':
clone[key] = String(prop);
break;
case 'Array':
clone[key] = prop.slice();
break;
case 'Object':
clone[key] = cloneObject(prop);
break;
case 'Null':
clone[key] = null;
break;
case 'Undefined':
clone[key] = undefined;
break;
default:
clone[key] = prop;
}
});
return clone;
}
function isValidEmail(value) {
var regEx = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return (value.length !== 0 && regEx.test(value))
}
>>>>>>>
/**
* Returns a slugified string, e.g. for use in a published filename
* Removes non-word/whitespace chars, converts to lowercase and replaces spaces with hyphens
* Multiple arguments are joined with spaces (and therefore hyphenated)
* @return {string}
**/
function slugify() {
var str = Array.apply(null,arguments).join(' ');
var strip_re = /[^\w\s-]/g;
var hyphenate_re = /[-\s]+/g;
str = str.replace(strip_re, '').trim()
str = str.toLowerCase();
str = str.replace(hyphenate_re, '-');
return str;
}
function cloneObject(obj) {
var clone = {};
if(!obj) return clone;
Object.keys(obj).forEach(function(key) {
var prop = obj[key];
// type-specific copying
switch(Object.prototype.toString.call(prop).match(/\[object (.+)\]/)[1]) {
case 'Number':
clone[key] = Number(prop);
break;
case 'String':
clone[key] = String(prop);
break;
case 'Array':
clone[key] = prop.slice();
break;
case 'Object':
clone[key] = cloneObject(prop);
break;
case 'Null':
clone[key] = null;
break;
case 'Undefined':
clone[key] = undefined;
break;
default:
clone[key] = prop;
}
});
return clone;
}
function isValidEmail(value) {
var regEx = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return (value.length !== 0 && regEx.test(value))
}
<<<<<<<
replaceAll: replaceAll,
slugify: slugify
=======
isValidEmail: isValidEmail,
replaceAll: replaceAll,
cloneObject: cloneObject
>>>>>>>
isValidEmail: isValidEmail,
replaceAll: replaceAll,
cloneObject: cloneObject,
slugify: slugify |
<<<<<<<
var margin = {top: 30, right: 30, bottom: 50, left: 60},
color = d3.scale.category20().range(),
width = null,
=======
var margin = {top: 30, right: 20, bottom: 50, left: 60},
color = nv.utils.getColor(),
width = null,
>>>>>>>
var margin = {top: 30, right: 30, bottom: 50, left: 60},
color = nv.utils.getColor(),
width = null, |
<<<<<<<
=======
wrapLabels: {get: function(){return wrapLabels;}, set: function(_){wrapLabels=!!_;}},
// deprecated options
tooltips: {get: function(){return tooltip.enabled();}, set: function(_){
// deprecated after 1.7.1
nv.deprecated('tooltips', 'use chart.tooltip.enabled() instead');
tooltip.enabled(!!_);
}},
tooltipContent: {get: function(){return tooltip.contentGenerator();}, set: function(_){
// deprecated after 1.7.1
nv.deprecated('tooltipContent', 'use chart.tooltip.contentGenerator() instead');
tooltip.contentGenerator(_);
}},
>>>>>>>
wrapLabels: {get: function(){return wrapLabels;}, set: function(_){wrapLabels=!!_;}}, |
<<<<<<<
, xRange
, yRange
=======
, groupSpacing = 0.1
>>>>>>>
, xRange
, yRange
, groupSpacing = 0.1
<<<<<<<
x .domain(xDomain || d3.merge(seriesData).map(function(d) { return d.x }))
.rangeBands(xRange || [0, availableWidth], .1);
=======
x .domain(d3.merge(seriesData).map(function(d) { return d.x }))
.rangeBands([0, availableWidth], groupSpacing);
>>>>>>>
x .domain(xDomain || d3.merge(seriesData).map(function(d) { return d.x }))
.rangeBands(xRange || [0, availableWidth], groupSpacing); |
<<<<<<<
Object.keys(uniswapMarketTvlBalances).map(address => {
if (balances[address]) {
balances[address] = BigNumber(
balances[address]
=======
Object.keys(uniswapMarketTvlBalances).forEach(address => {
if (balances[address]) {
balances[address] = BigNumber(
balances[address]
>>>>>>>
Object.keys(uniswapMarketTvlBalances).forEach(address => {
if (balances[address]) {
balances[address] = BigNumber(
balances[address]
<<<<<<<
console.log(balances)
return balances;
}
/*==================================================
Rates
==================================================*/
async function rates(timestamp, block) {
// DeFi Pulse only supports single market atm, so no rates from Uniswap market (e.g. Dai on Uniswap market)
return await _multiMarketRates(aaveLendingPool, aaveReserves, block)
=======
return balances;
>>>>>>>
return balances;
}
/*==================================================
Rates
==================================================*/
async function rates(timestamp, block) {
// DeFi Pulse only supports single market atm, so no rates from Uniswap market (e.g. Dai on Uniswap market)
return await _multiMarketRates(aaveLendingPool, aaveReserves, block)
<<<<<<<
name: "Aave",
website: "https://aave.com",
token: "LEND",
category: "lending",
start: 1578355200, // 01/07/2020 @ 12:00am (UTC)
tvl,
rates,
term: "1 block",
variability: "medium",
};
=======
name: 'Aave',
token: 'LEND',
category: 'lending',
start: 1578355200, // 01/07/2020 @ 12:00am (UTC)
tvl
};
>>>>>>>
name: "Aave",
website: "https://aave.com",
token: "LEND",
category: "lending",
start: 1578355200, // 01/07/2020 @ 12:00am (UTC)
tvl,
rates,
term: "1 block",
variability: "medium",
}; |
<<<<<<<
addImageChoicesTo("types",typeList.slice(0,typeList.length-2));
=======
addIconChoicesTo("types", typeList.slice(0,typeList.length-2), "checkbox", "equipment");
>>>>>>>
addIconChoicesTo("types", typeList.slice(0,typeList.length-2), "checkbox", "equipment");
<<<<<<<
addImageChoicesTo("elements",elementList);
addTextChoicesTo("elementsSkillTypes",'checkbox',{'Passive':'passives', 'Active':'actives', 'LB':'lb'});
addTextChoicesTo("elementsTargetAreaTypes",'checkbox',{'ST':'ST', 'AOE':'AOE'});
selectAll("elementsSkillTypes");
selectAll("elementsTargetAreaTypes");
=======
addIconChoicesTo("elements", elementList, "checkbox", "elem-ailm");
>>>>>>>
addIconChoicesTo("elements", elementList, "checkbox", "elem-ailm");
addTextChoicesTo("elementsSkillTypes",'checkbox',{'Passive':'passives', 'Active':'actives', 'LB':'lb'});
addTextChoicesTo("elementsTargetAreaTypes",'checkbox',{'ST':'ST', 'AOE':'AOE'});
selectAll("elementsSkillTypes");
selectAll("elementsTargetAreaTypes");
<<<<<<<
addImageChoicesTo("ailments",ailmentList);
addTextChoicesTo("ailmentsSkillTypes",'checkbox',{'Passive':'passives', 'Active':'actives', 'LB':'lb'});
addTextChoicesTo("ailmentsTargetAreaTypes",'checkbox',{'ST':'ST', 'AOE':'AOE'});
selectAll("ailmentsSkillTypes");
selectAll("ailmentsTargetAreaTypes");
// Killers
addImageChoicesTo("physicalKillers",killerList, type="checkbox", "physicalKiller_");
addImageChoicesTo("magicalKillers",killerList, type="checkbox", "magicalKiller_");
addTextChoicesTo("killersSkillTypes",'checkbox',{'Passive':'passives', 'Active':'actives', 'LB':'lb'});
selectAll("killersSkillTypes");
=======
addIconChoicesTo("ailments", ailmentList, "checkbox", "elem-ailm");
// Killers
addIconChoicesTo("physicalKillers", killerList.map(function(v){return 'physicalKiller_'+v}), "checkbox", "killer");
addIconChoicesTo("magicalKillers", killerList.map(function(v){return 'magicalKiller_'+v}), "checkbox", "killer");
>>>>>>>
addIconChoicesTo("ailments", ailmentList, "checkbox", "elem-ailm");
addTextChoicesTo("ailmentsSkillTypes",'checkbox',{'Passive':'passives', 'Active':'actives', 'LB':'lb'});
addTextChoicesTo("ailmentsTargetAreaTypes",'checkbox',{'ST':'ST', 'AOE':'AOE'});
selectAll("ailmentsSkillTypes");
selectAll("ailmentsTargetAreaTypes");
// Killers
addIconChoicesTo("physicalKillers", killerList.map(function(v){return 'physicalKiller_'+v}), "checkbox", "killer");
addIconChoicesTo("magicalKillers", killerList.map(function(v){return 'magicalKiller_'+v}), "checkbox", "killer");
addTextChoicesTo("killersSkillTypes",'checkbox',{'Passive':'passives', 'Active':'actives', 'LB':'lb'});
selectAll("killersSkillTypes");
<<<<<<<
addImageChoicesTo("imperils",elementList);
addTextChoicesTo("imperilsSkillTypes",'checkbox',{'Active':'actives', 'LB':'lb'});
addTextChoicesTo("imperilsTargetAreaTypes",'checkbox',{'ST':'ST', 'AOE':'AOE'});
selectAll("imperilsSkillTypes");
selectAll("imperilsTargetAreaTypes");
=======
addIconChoicesTo("imperils", elementList, "checkbox", "elem-ailm");
>>>>>>>
addIconChoicesTo("imperils", elementList, "checkbox", "elem-ailm");
addTextChoicesTo("imperilsSkillTypes",'checkbox',{'Active':'actives', 'LB':'lb'});
addTextChoicesTo("imperilsTargetAreaTypes",'checkbox',{'ST':'ST', 'AOE':'AOE'});
selectAll("imperilsSkillTypes");
selectAll("imperilsTargetAreaTypes"); |
<<<<<<<
<Tooltip id={`${id}-selectbox-tooltip`} placement={'bottom'} tooltip={selectedItem ? selectedItem.value : ''}>
<button className={`btn btn-default dropdown-toggle ${style['dropdown-button']} ${validationClass}`} type='button' data-toggle='dropdown' id={`${id}-button-toggle`}>
<span className={style['dropdown-button-text']} id={`${id}-button-text`} >
{selectedItem ? selectedItem.value : NOBREAK_SPACE}
</span>
<span className='caret' id={`${id}-button-caret`} />
</button>
</Tooltip>
=======
<button
className={`btn btn-default dropdown-toggle ${style['dropdown-button']} ${validationClass}`}
type='button'
data-toggle='dropdown'
id={`${id}-button-toggle`}
disabled={disabled}
>
<span className={style['dropdown-button-text']} id={`${id}-button-text`} title={selectedItem && selectedItem.value}>
{selectedItem ? selectedItem.value : NOBREAK_SPACE}
</span>
<span className='caret' id={`${id}-button-caret`} />
</button>
>>>>>>>
<Tooltip id={`${id}-selectbox-tooltip`} placement={'bottom'} tooltip={selectedItem ? selectedItem.value : ''}>
<button
className={`btn btn-default dropdown-toggle ${style['dropdown-button']} ${validationClass}`}
type='button'
data-toggle='dropdown'
id={`${id}-button-toggle`}
disabled={disabled}
>
<span className={style['dropdown-button-text']} id={`${id}-button-text`} >
{selectedItem ? selectedItem.value : NOBREAK_SPACE}
</span>
<span className='caret' id={`${id}-button-caret`} />
</button>
</Tooltip> |
<<<<<<<
setOvirtApiVersion,
=======
getAllTemplates,
getAllClusters,
getAllOperatingSystems,
addClusters,
addTemplates,
addAllOS,
updateCluster,
changeCluster,
updateTemplate,
changeTemplate,
updateOperatingSystem,
updateVmMemory,
updateVmCpu,
updateVmName,
updateDialogType,
updateVmId,
updateEditTemplateName,
updateEditTemplateDescription,
updateEditTemplateOS,
updateEditTemplateMemory,
updateEditTemplateCpu,
openVmDialog,
closeVmDialog,
openVmDetail,
closeVmDetail,
updateEditTemplate,
closeEditTemplate,
closeDetail,
updateVmDialogErrorMessage,
updateEditTemplateErrorMessage,
>>>>>>>
setOvirtApiVersion,
getAllTemplates,
getAllClusters,
getAllOperatingSystems,
addClusters,
addTemplates,
addAllOS,
updateCluster,
changeCluster,
updateTemplate,
changeTemplate,
updateOperatingSystem,
updateVmMemory,
updateVmCpu,
updateVmName,
updateDialogType,
updateVmId,
updateEditTemplateName,
updateEditTemplateDescription,
updateEditTemplateOS,
updateEditTemplateMemory,
updateEditTemplateCpu,
openVmDialog,
closeVmDialog,
openVmDetail,
closeVmDetail,
updateEditTemplate,
closeEditTemplate,
closeDetail,
updateVmDialogErrorMessage,
updateEditTemplateErrorMessage,
<<<<<<<
import {
LOGIN,
LOGOUT,
GET_ALL_VMS,
PERSIST_STATE,
SHUTDOWN_VM,
RESTART_VM,
START_VM,
GET_CONSOLE_VM,
SUSPEND_VM,
SELECT_VM_DETAIL,
SCHEDULER__1_MIN,
} from './constants'
// import store from './store'
=======
>>>>>>>
import {
LOGIN,
LOGOUT,
GET_ALL_VMS,
PERSIST_STATE,
SHUTDOWN_VM,
RESTART_VM,
START_VM,
GET_CONSOLE_VM,
SUSPEND_VM,
SELECT_VM_DETAIL,
SCHEDULER__1_MIN,
} from './constants'
// import store from './store'
<<<<<<<
const oVirtMeta = yield callExternalAction('getOvirtApiMeta', Api.getOvirtApiMeta, action)
if (!oVirtMeta['product_info']) { // REST API call failed
yield put(yield put(loadInProgress({ value: false })))
} else {
if (yield checkOvirtApiVersion(oVirtMeta)) {
yield put(getAllVms({ shallowFetch: false }))
} else { // oVirt API of incompatible version
console.error('oVirt api version check failed')
yield put(failedExternalAction({
message: composeIncompatibleOVirtApiVersionMessage(oVirtMeta),
shortMessage: 'oVirt API version check failed' }))
yield put(yield put(loadInProgress({ value: false })))
}
}
=======
yield put(getAllVms({ shallowFetch: false }))
yield put(getAllClusters()) // no shallow
yield put(getAllOperatingSystems())
yield put(getAllTemplates({ shallowFetch: false }))
>>>>>>>
const oVirtMeta = yield callExternalAction('getOvirtApiMeta', Api.getOvirtApiMeta, action)
if (!oVirtMeta['product_info']) { // REST API call failed
yield put(yield put(loadInProgress({ value: false })))
} else {
if (yield checkOvirtApiVersion(oVirtMeta)) {
yield put(getAllVms({ shallowFetch: false }))
yield put(getAllClusters()) // no shallow
yield put(getAllOperatingSystems())
yield put(getAllTemplates({ shallowFetch: false }))
} else { // oVirt API of incompatible version
console.error('oVirt api version check failed')
yield put(failedExternalAction({
message: composeIncompatibleOVirtApiVersionMessage(oVirtMeta),
shortMessage: 'oVirt API version check failed' }))
yield put(yield put(loadInProgress({ value: false })))
}
} |
<<<<<<<
], function contentDialogInit(Application, _Dispose, Promise, _Signal, _LightDismissService, _BaseUtils, _Global, _WinRT, _Base, _Events, _ErrorFromName, _Resources, _Control, _ElementUtilities, _Hoverable, _Animations) {
=======
], function contentDialogInit(Application, _Dispose, _Accents, Promise, _Signal, _BaseUtils, _Global, _WinRT, _Base, _Events, _ErrorFromName, _Resources, _Control, _ElementUtilities, _Hoverable, _Animations) {
>>>>>>>
], function contentDialogInit(Application, _Dispose, _Accents, Promise, _Signal, _LightDismissService, _BaseUtils, _Global, _WinRT, _Base, _Events, _ErrorFromName, _Resources, _Control, _ElementUtilities, _Hoverable, _Animations) {
<<<<<<<
=======
_Accents.createAccentRule(".win-contentdialog-dialog", [{ name: "outline-color", value: _Accents.ColorTypes.accent }]);
var ContentDialogManager;
// Need to be the first one to register these events so that they can be
// canceled before any other listener sees them.
var eventsToBlock = [
"edgystarting",
"edgycompleted",
"edgycanceled"
];
function blockEventIfDialogIsShowing(eventObject) {
if (ContentDialogManager && ContentDialogManager.aDialogIsShowing()) {
eventObject.stopImmediatePropagation();
}
}
eventsToBlock.forEach(function (eventName) {
Application.addEventListener(eventName, blockEventIfDialogIsShowing);
});
>>>>>>>
_Accents.createAccentRule(".win-contentdialog-dialog", [{ name: "outline-color", value: _Accents.ColorTypes.accent }]); |
<<<<<<<
var _MSGestureEvent = global.MSGestureEvent || {
MSGESTURE_FLAG_BEGIN: 1,
MSGESTURE_FLAG_CANCEL: 4,
MSGESTURE_FLAG_END: 2,
MSGESTURE_FLAG_INERTIA: 8,
MSGESTURE_FLAG_NONE: 0
};
var _MSManipulationEvent = global.MSManipulationEvent || {
MS_MANIPULATION_STATE_ACTIVE: 1,
MS_MANIPULATION_STATE_CANCELLED: 6,
MS_MANIPULATION_STATE_COMMITTED: 7,
MS_MANIPULATION_STATE_DRAGGING: 5,
MS_MANIPULATION_STATE_INERTIA: 2,
MS_MANIPULATION_STATE_PRESELECT: 3,
MS_MANIPULATION_STATE_SELECTING: 4,
MS_MANIPULATION_STATE_STOPPED: 0
};
=======
var _MSPointerEvent = global.MSPointerEvent || {
MSPOINTER_TYPE_TOUCH: "touch",
MSPOINTER_TYPE_PEN: "pen",
MSPOINTER_TYPE_MOUSE: "mouse",
};
function addPointerHandlers(element, eventNameLowercase, callback, capture) {
if (!element._pointerEventsMap) {
element._pointerEventsMap = {};
}
if (!element._pointerEventsMap[eventNameLowercase]) {
element._pointerEventsMap[eventNameLowercase] = [];
}
var mouseWrapper,
touchWrapper;
var translations = eventTranslations[eventNameLowercase];
// Browsers fire a touch event and then a mouse event when the input is touch. touchHandled is used to prevent invoking the pointer callback twice.
var touchHandled;
if (translations.mouse) {
mouseWrapper = function (eventObject) {
eventObject._normalizedType = eventNameLowercase;
if (!touchHandled) {
return mouseEventTranslator(callback, eventObject);
}
touchHandled = false;
}
element.addEventListener(translations.mouse, mouseWrapper, capture);
}
if (translations.touch) {
touchWrapper = function (eventObject) {
eventObject._normalizedType = eventNameLowercase;
touchHandled = true;
return touchEventTranslator(callback, eventObject);
}
element.addEventListener(translations.touch, touchWrapper, capture);
}
element._pointerEventsMap[eventNameLowercase].push({
originalCallback: callback,
mouseWrapper: mouseWrapper,
touchWrapper: touchWrapper,
capture: capture
});
}
function removePointerHandlers(element, eventNameLowercase, callback, capture) {
if (!element._pointerEventsMap || !element._pointerEventsMap[eventNameLowercase]) {
return;
}
var mappedEvents = element._pointerEventsMap[eventNameLowercase];
for (var i = mappedEvents.length - 1; i >= 0; i--) {
var mapping = mappedEvents[i];
if (mapping.originalCallback === callback && (!!capture === !!mapping.capture)) {
var translations = eventTranslations[eventNameLowercase];
if (mapping.mouseWrapper) {
element.removeEventListener(translations.mouse, mapping.mouseWrapper, capture);
}
if (mapping.touchWrapper) {
element.removeEventListener(translations.touch, mapping.touchWrapper, capture);
}
mappedEvents.splice(i, 1);
break;
}
}
}
function touchEventTranslator(callback, eventObject) {
eventObject._handledTouch = true;
var changedTouches = eventObject.changedTouches,
retVal = null;
for (var i = 0, len = changedTouches.length; i < len; i++) {
var touchObject = changedTouches[i];
eventObject.pointerType = _MSPointerEvent.MSPOINTER_TYPE_TOUCH;
eventObject.pointerId = touchObject.identifier;
eventObject.screenX = touchObject.screenX;
eventObject.screenY = touchObject.screenY;
eventObject.clientX = touchObject.clientX;
eventObject.clientY = touchObject.clientY;
eventObject.pageX = touchObject.pageX;
eventObject.pageY = touchObject.pageY;
eventObject.radiusX = touchObject.radiusX;
eventObject.radiusY = touchObject.radiusY;
eventObject.rotationAngle = touchObject.rotationAngle;
eventObject.force = touchObject.force;
eventObject._currentTouch = touchObject;
retVal = retVal || callback(eventObject);
}
return retVal;
}
function mouseEventTranslator(callback, eventObject) {
eventObject.pointerType = _MSPointerEvent.MSPOINTER_TYPE_MOUSE;
eventObject.pointerId = -1;
return callback(eventObject);
}
var eventTranslations = {
pointerdown: {
touch: "touchstart",
mouse: "mousedown"
},
pointerup: {
touch: "touchend",
mouse: "mouseup"
},
pointermove: {
touch: "touchmove",
mouse: "mousemove"
},
pointerenter: {
touch: null,
mouse: "mouseenter"
},
pointerover: {
touch: null,
mouse: "mouseover"
},
pointerout: {
touch: "touchleave",
mouse: "mouseout"
},
pointercancel: {
touch: "touchcancel",
mouse: null
}
};
>>>>>>>
var _MSGestureEvent = global.MSGestureEvent || {
MSGESTURE_FLAG_BEGIN: 1,
MSGESTURE_FLAG_CANCEL: 4,
MSGESTURE_FLAG_END: 2,
MSGESTURE_FLAG_INERTIA: 8,
MSGESTURE_FLAG_NONE: 0
};
var _MSManipulationEvent = global.MSManipulationEvent || {
MS_MANIPULATION_STATE_ACTIVE: 1,
MS_MANIPULATION_STATE_CANCELLED: 6,
MS_MANIPULATION_STATE_COMMITTED: 7,
MS_MANIPULATION_STATE_DRAGGING: 5,
MS_MANIPULATION_STATE_INERTIA: 2,
MS_MANIPULATION_STATE_PRESELECT: 3,
MS_MANIPULATION_STATE_SELECTING: 4,
MS_MANIPULATION_STATE_STOPPED: 0
};
var _MSPointerEvent = global.MSPointerEvent || {
MSPOINTER_TYPE_TOUCH: "touch",
MSPOINTER_TYPE_PEN: "pen",
MSPOINTER_TYPE_MOUSE: "mouse",
};
function addPointerHandlers(element, eventNameLowercase, callback, capture) {
if (!element._pointerEventsMap) {
element._pointerEventsMap = {};
}
if (!element._pointerEventsMap[eventNameLowercase]) {
element._pointerEventsMap[eventNameLowercase] = [];
}
var mouseWrapper,
touchWrapper;
var translations = eventTranslations[eventNameLowercase];
// Browsers fire a touch event and then a mouse event when the input is touch. touchHandled is used to prevent invoking the pointer callback twice.
var touchHandled;
if (translations.mouse) {
mouseWrapper = function (eventObject) {
eventObject._normalizedType = eventNameLowercase;
if (!touchHandled) {
return mouseEventTranslator(callback, eventObject);
}
touchHandled = false;
}
element.addEventListener(translations.mouse, mouseWrapper, capture);
}
if (translations.touch) {
touchWrapper = function (eventObject) {
eventObject._normalizedType = eventNameLowercase;
touchHandled = true;
return touchEventTranslator(callback, eventObject);
}
element.addEventListener(translations.touch, touchWrapper, capture);
}
element._pointerEventsMap[eventNameLowercase].push({
originalCallback: callback,
mouseWrapper: mouseWrapper,
touchWrapper: touchWrapper,
capture: capture
});
}
function removePointerHandlers(element, eventNameLowercase, callback, capture) {
if (!element._pointerEventsMap || !element._pointerEventsMap[eventNameLowercase]) {
return;
}
var mappedEvents = element._pointerEventsMap[eventNameLowercase];
for (var i = mappedEvents.length - 1; i >= 0; i--) {
var mapping = mappedEvents[i];
if (mapping.originalCallback === callback && (!!capture === !!mapping.capture)) {
var translations = eventTranslations[eventNameLowercase];
if (mapping.mouseWrapper) {
element.removeEventListener(translations.mouse, mapping.mouseWrapper, capture);
}
if (mapping.touchWrapper) {
element.removeEventListener(translations.touch, mapping.touchWrapper, capture);
}
mappedEvents.splice(i, 1);
break;
}
}
}
function touchEventTranslator(callback, eventObject) {
eventObject._handledTouch = true;
var changedTouches = eventObject.changedTouches,
retVal = null;
for (var i = 0, len = changedTouches.length; i < len; i++) {
var touchObject = changedTouches[i];
eventObject.pointerType = _MSPointerEvent.MSPOINTER_TYPE_TOUCH;
eventObject.pointerId = touchObject.identifier;
eventObject.screenX = touchObject.screenX;
eventObject.screenY = touchObject.screenY;
eventObject.clientX = touchObject.clientX;
eventObject.clientY = touchObject.clientY;
eventObject.pageX = touchObject.pageX;
eventObject.pageY = touchObject.pageY;
eventObject.radiusX = touchObject.radiusX;
eventObject.radiusY = touchObject.radiusY;
eventObject.rotationAngle = touchObject.rotationAngle;
eventObject.force = touchObject.force;
eventObject._currentTouch = touchObject;
retVal = retVal || callback(eventObject);
}
return retVal;
}
function mouseEventTranslator(callback, eventObject) {
eventObject.pointerType = _MSPointerEvent.MSPOINTER_TYPE_MOUSE;
eventObject.pointerId = -1;
return callback(eventObject);
}
var eventTranslations = {
pointerdown: {
touch: "touchstart",
mouse: "mousedown"
},
pointerup: {
touch: "touchend",
mouse: "mouseup"
},
pointermove: {
touch: "touchmove",
mouse: "mousemove"
},
pointerenter: {
touch: null,
mouse: "mouseenter"
},
pointerover: {
touch: null,
mouse: "mouseover"
},
pointerout: {
touch: "touchleave",
mouse: "mouseout"
},
pointercancel: {
touch: "touchcancel",
mouse: null
}
}; |
<<<<<<<
/**
* @notice Implements bitcoin's hash256 (double sha2)
* @param {Uint8Array} preImage The pre-image
* @returns {Uint8Array} The digest
*/
hash256: (preImage) => {
return utils.sha256(utils.sha256(preImage));
},
=======
/**
* @notice Implements bitcoin's hash256 (double sha2)
* @param {Uint8Array} preImage The pre-image
* @returns {Uint8Array} The digest
*/
hash256: preImage => utils.sha256(utils.sha256(preImage)),
>>>>>>>
/**
* @notice Implements bitcoin's hash256 (double sha2)
* @param {Uint8Array} preImage The pre-image
* @returns {Uint8Array} The digest
*/
hash256: preImage => utils.sha256(utils.sha256(preImage)),
<<<<<<<
let len;
let offset = 1n;
for (let i = 0; i <= index; i++) {
let remaining;
=======
let len = 0;
let remaining = 0;
let offset = BigInt(1);
for (let i = 0; i <= index; i += 1) {
>>>>>>>
let len = 0;
// let remaining = 0;
let offset = BigInt(1);
for (let i = 0; i <= index; i ++) {
let remaining = utils.safeSlice(vinArr, offset, vinArr.length - 1);
len = module.exports.determineInputLength(remaining);
if (i !== index) {
offset += len;
}
}
return utils.safeSlice(vinArr, offset, offset + len);
},
/**
* @notice Determines whether an input is legacy
* @dev False if no scriptSig, otherwise True
* @param {Uint8Array} input The input
* @returns {boolean} True for legacy, False for witness
*/
isLegacyInput: input => input[36] !== 0,
/**
* @notice Determines the length of an input from its scriptsig
* @dev 36 for outpoint, 1 for scriptsig length, 4 for sequence
* @param {Uint8Array} arr The input as a u8a
* @returns {BigInt} The length of the input in bytes
*/
determineInputLength: (arr) => {
let { dataLen, scriptSigLen } = module.exports.extractScriptSigLen(arr);
return BigInt(41) + dataLen + scriptSigLen;
},
/**
* @notice Extracts the LE sequence bytes from an input
* @dev Sequence is used for relative time locks
* @param {Uint8Array} input The LEGACY input
* @returns {Uint8Array} The sequence bytes (LE uint)
*/
extractSequenceLELegacy: (input) => {
let { dataLen, scriptSigLen } = module.exports.extractScriptSigLen(input);
let length = 36 + 1 + Number(dataLen) + Number(scriptSigLen);
return utils.safeSlice(input, length, length + 4);
},
/**
* @notice Extracts the sequence from the input
* @dev Sequence is a 4-byte little-endian number
* @param {Uint8Array} input The LEGACY input
* @returns {Uint8Array} The sequence number (big-endian uint array)
*/
extractSequenceLegacy: (input) => {
const leSeqence = module.exports.extractSequenceLELegacy(input);
const beSequence = module.exports.reverseEndianness(leSeqence);
return utils.bytesToUint(beSequence);
},
/**
* @notice Extracts the VarInt-prepended scriptSig from the input in a tx
* @dev Will return hex"00" if passed a witness input
* @param {Uint8Array} input The LEGACY input
* @returns {Uint8Array} The length-prepended script sig
*/
extractScriptSig: (input) => {
let {dataLen, scriptSigLen} = module.exports.extractScriptSigLen(input)
let length = 1 + Number(dataLen) + Number(scriptSigLen);
return utils.safeSlice(input, 36, 36 + length);
},
/**
* @notice Determines the length of a scriptSig in an input
* @dev Will return 0 if passed a witness input
* @param {Uint8Array} arr The LEGACY input
* @returns {object} The length of the script sig in object form
*/
extractScriptSigLen: (arr) => {
const varIntTag = utils.safeSlice(arr, 36, 37);
const varIntDataLen = module.exports.determineVarIntDataLength(varIntTag[0]);
let len = 0;
if (varIntDataLen === 0) {
[len] = varIntTag;
} else {
len = utils.bytesToUint(
module.exports.reverseEndianness(utils.safeSlice(arr, 37, 37 + varIntDataLen))
);
}
return { dataLen: BigInt(varIntDataLen), scriptSigLen: BigInt(len) };
},
/* ************* */
/* Witness Input */
/* ************* */
/**
* @notice Extracts the LE sequence bytes from an input
* @dev Sequence is used for relative time locks
* @param {Uint8Array} input The WITNESS input
* @returns {Uint8Array} The sequence bytes (LE uint)
*/
extractSequenceLEWitness: input => utils.safeSlice(input, 37, 41),
/**
* @notice Extracts the sequence from the input in a tx
* @dev Sequence is a 4-byte little-endian number
* @param {Uint8Array} input The WITNESS input
* @returns {Uint8Array} The sequence number (big-endian u8a)
*/
extractSequenceWitness: (input) => {
const leSeqence = module.exports.extractSequenceLEWitness(input);
const inputSequence = module.exports.reverseEndianness(leSeqence);
return utils.bytesToUint(inputSequence);
},
/**
* @notice Extracts the outpoint from the input in a tx
* @dev 32 byte tx id with 4 byte index
* @param {Uint8Array} input The input
* @returns {Uint8Array} The outpoint (LE bytes of prev tx hash + LE bytes of prev tx index)
*/
extractOutpoint: input => utils.safeSlice(input, 0, 36),
/**
* @notice Extracts the outpoint tx id from an input
* @dev 32 byte tx id
* @param {Uint8Array} input The input
* @returns {Uint8Array} The tx id (little-endian bytes)
*/
// TODO: no test, check against function that uses this
extractInputTxIdLE: input => utils.safeSlice(input, 0, 32),
/**
* @notice Extracts the outpoint index from an input
* @dev 32 byte tx id
* @param {Uint8Array} input The input
* @returns {Uint8Array} The tx id (big-endian bytes)
*/
// TODO: no test, check against function that uses this
extractInputTxId: (input) => {
const leId = module.exports.extractInputTxIdLE(input);
return module.exports.reverseEndianness(leId);
},
/**
* @notice Extracts the LE tx input index from the input in a tx
* @dev 4 byte tx index
* @param {Uint8Array} input The input
* @returns {Uint8Array} The tx index (little-endian bytes)
*/
// TODO: no test, check against function that uses this
extractTxIndexLE: input => utils.safeSlice(input, 32, 36),
/**
* @notice Extracts the LE tx input index from the input in a tx
* @dev 4 byte tx index
* @param {Uint8Array} input The input
* @returns {BigInt} The tx index (big-endian uint)
*/
// TODO: no test, check against function that uses this
extractTxIndex: (input) => {
const leIndex = module.exports.extractTxIndexLE(input);
const beIndex = module.exports.reverseEndianness(leIndex);
return utils.bytesToUint(beIndex);
},
/* ****** */
/* Output */
/* ****** */
/**
* @notice Determines the length of an output
* @dev 5 types: WPKH, WSH, PKH, SH, and OP_RETURN
* @param {Uint8Array} output The output
* @returns {number} The length indicated by the prefix, error if invalid length
*/
determineOutputLength: (output) => {
const len = utils.safeSlice(output, 8, 9)[0];
if (len > 0xfd) {
throw new Error('Multi-byte VarInts not supported');
}
return BigInt(len) + BigInt(8 + 1); // 8 byte value, 1 byte for len itself
},
/**
* @notice Extracts the output at a given index in the TxIns vector
* @dev Iterates over the vout. If you need to extract multiple,
* write a custom function
* @param {Uint8Array} vout The _vout to extract from
* @param {number} index The 0-indexed location of the output to extract
* @returns {Uint8Array} The specified output
*/
extractOutputAtIndex: (vout, index) => {
let len;
let remaining;
let offset = BigInt(1);
for (let i = 0; i <= index; i += 1) {
<<<<<<<
isLegacyInput: (input) => {
return input[36] !== 0;
},
=======
isLegacyInput: input => input[36] !== 0,
>>>>>>>
isLegacyInput: input => input[36] !== 0,
<<<<<<<
let { dataLen, scriptSigLen } = module.exports.extractScriptSigLen(arr);
return BigInt(41) + dataLen + scriptSigLen;
=======
const res = module.exports.extractScriptSigLen(arr);
const { dataLen, scriptSigLen } = res;
return BigInt(41) + dataLen + scriptSigLen;
>>>>>>>
let { dataLen, scriptSigLen } = module.exports.extractScriptSigLen(arr);
return BigInt(41) + dataLen + scriptSigLen;
<<<<<<<
let { dataLen, scriptSigLen } = module.exports.extractScriptSigLen(input);
let length = 36 + 1 + Number(dataLen) + Number(scriptSigLen);
=======
const res = module.exports.extractScriptSigLen(input);
const { dataLen, scriptSigLen } = res;
const length = 36 + 1 + Number(dataLen) + Number(scriptSigLen);
>>>>>>>
let { dataLen, scriptSigLen } = module.exports.extractScriptSigLen(input);
let length = 36 + 1 + Number(dataLen) + Number(scriptSigLen);
<<<<<<<
let {dataLen, scriptSigLen} = module.exports.extractScriptSigLen(input)
let length = 1 + Number(dataLen) + Number(scriptSigLen);
=======
const res = module.exports.extractScriptSigLen(input);
const { dataLen, scriptSigLen } = res;
const length = 1 + Number(dataLen) + Number(scriptSigLen);
>>>>>>>
let {dataLen, scriptSigLen} = module.exports.extractScriptSigLen(input)
let length = 1 + Number(dataLen) + Number(scriptSigLen);
<<<<<<<
if (utils.safeSlice(output, 10, 11)[0] != len) {
throw new Error('Witness output maliciously formatted.');
=======
if (output[10] !== len) {
return null;
>>>>>>>
if (output[10] != len) {
throw new Error('Witness output maliciously formatted.');
<<<<<<<
let length = (proofLength / 32) - 1
for (let i = 1; i < length; i++) {
let next = utils.safeSlice(proof, (i * 32), ((i * 32) + 32))
if (idx % 2n === 1n) {
current = module.exports.hash256MerkleStep(next, current);
=======
for (let i = 1; i < ((proofLength / 32) - 1); i += 1) {
const next = utils.safeSlice(proof, (i * 32), ((i * 32) + 32));
if (idx % 2 === 1) {
current = module.exports.hash256MerkleStep(next, current);
>>>>>>>
let length = (proofLength / 32) - 1
for (let i = 1; i < length; i++) {
let next = utils.safeSlice(proof, (i * 32), ((i * 32) + 32))
if (idx % 2 === 1) {
current = module.exports.hash256MerkleStep(next, current);
<<<<<<<
const lowerBound = rp / 4n;
const upperBound = rp * 4n;
=======
const div = rp / BigInt(4);
const mult = rp * BigInt(4);
>>>>>>>
const lowerBound = rp / BigInt(4);
const upperBound = rp * BigInt(4);
<<<<<<<
return previousTarget * elapsedTime / module.exports.RETARGET_PERIOD;
=======
/*
NB: high targets e.g. ffff0020 can cause overflows here
so we divide it by 256**2, then multiply by 256**2 later
we know the target is evenly divisible by 256**2, so this isn't an issue
*/
const adjusted = (previousTarget) * elapsedTime;
return (adjusted / module.exports.RETARGET_PERIOD);
>>>>>>>
return previousTarget * elapsedTime / module.exports.RETARGET_PERIOD; |
<<<<<<<
'velocity'
], function (Origin, Router, User, SessionModel, NavigationView, GlobalMenu, Sidebar, Helpers, ContextMenu, Polyglot) {
=======
'coreJS/app/contextMenu',
'jquery-ui'
], function (Origin, Router, User, SessionModel, NavigationView, GlobalMenu, Helpers, Polyglot, Templates, ContextMenu, JQueryUI) {
>>>>>>>
'velocity'
], function (Origin, Router, User, SessionModel, NavigationView, GlobalMenu, Sidebar, Helpers, ContextMenu, Polyglot, JQueryUI) { |
<<<<<<<
for (let i = 0; i <= index; i ++) {
let remaining = utils.safeSlice(vinArr, offset, vinArr.length);
=======
for (let i = 0; i <= index; i += 1) {
const remaining = utils.safeSlice(vinArr, offset, vinArr.length - 1);
>>>>>>>
for (let i = 0; i <= index; i += 1) {
const remaining = utils.safeSlice(vinArr, offset, vinArr.length); |
<<<<<<<
const vectorObj = JSON.parse(JSON.stringify(vectors));
utils.updateJson(vectorObj);
const {
HEADER_170,
OP_RETURN_PROOF,
OP_RETURN_INDEX,
OUTPOINT,
HASH_160,
HASH_256,
SEQUENCE_WITNESS,
SEQUENCE_LEGACY,
OUTPUT,
INDEXED_INPUT,
INDEXED_OUTPUT,
LEGACY_INPUT,
INPUT_LENGTH,
SCRIPT_SIGS,
SCRIPT_SIG_LEN,
INVALID_VIN_LEN,
INVALID_VOUT_LEN,
OUTPUT_LEN,
HEADER,
MERKLE_ROOT,
OP_RETURN,
TWO_IN,
RETARGET_TUPLES
=======
const vectorObj = JSON.parse(JSON.stringify(vectors));
utils.parseJson(vectorObj);
const {
extractOutpoint,
hash160,
hash256,
hash256MerkleStep,
extractSequenceLEWitness,
extractSequenceWitness,
extractSequenceLELegacy,
extractSequenceLegacy,
extractOutputScriptLen,
extractHash,
extractHashError,
extractOpReturnData,
extractOpReturnDataError,
extractInputAtIndex,
isLegacyInput,
extractValueLE,
extractValue,
determineInputLength,
extractScriptSig,
extractScriptSigLen,
validateVin,
validateVout,
determineOutputLength,
determineOutputLengthError,
extractOutputAtIndex,
extractMerkleRootBE,
extractTarget,
extractPrevBlockBE,
extractTimestamp,
verifyHash256Merkle,
determineVarIntDataLength,
retargetAlgorithm,
calculateDifficultyError
>>>>>>>
const vectorObj = JSON.parse(JSON.stringify(vectors));
utils.updateJson(vectorObj);
const {
extractOutpoint,
hash160,
hash256,
hash256MerkleStep,
extractSequenceLEWitness,
extractSequenceWitness,
extractSequenceLELegacy,
extractSequenceLegacy,
extractOutputScriptLen,
extractHash,
extractHashError,
extractOpReturnData,
extractOpReturnDataError,
extractInputAtIndex,
isLegacyInput,
extractValueLE,
extractValue,
determineInputLength,
extractScriptSig,
extractScriptSigLen,
validateVin,
validateVout,
determineOutputLength,
determineOutputLengthError,
extractOutputAtIndex,
extractMerkleRootBE,
extractTarget,
extractPrevBlockBE,
extractTimestamp,
verifyHash256Merkle,
determineVarIntDataLength,
retargetAlgorithm,
calculateDifficultyError
<<<<<<<
const res = BTCUtils.hash160(HASH_160[0].INPUT);
const u8aValue = HASH_160[0].OUTPUT;
const arraysAreEqual = utils.typedArraysAreEqual(res, u8aValue);
assert.isTrue(arraysAreEqual);
=======
for (let i = 0; i < hash160.length; i += 1) {
const res = BTCUtils.hash160(hash160[i].input);
const arraysAreEqual = utils.typedArraysAreEqual(res, hash160[i].output);
assert.isTrue(arraysAreEqual);
}
>>>>>>>
for (let i = 0; i < hash160.length; i += 1) {
const res = BTCUtils.hash160(hash160[i].input);
const arraysAreEqual = utils.typedArraysAreEqual(res, hash160[i].output);
assert.isTrue(arraysAreEqual);
} |
<<<<<<<
res = await BTCUtilsJs.extractHash(utils.deserializeHex(opReturnOutput));
assert.isNull(res);
// TODO: What type of error should be thrown here?
// try {
// await BTCUtilsJs.extractOpReturnData(output);
// assert(false, 'expected an error');
// } catch (e) {
// assert.include(e.message, 'Malformatted data. Must be an op return.');
// }
=======
try {
res = BTCUtilsJs.extractHash(utils.deserializeHex(opReturnOutput));
assert(false, 'expected an error');
} catch (e) {
assert.include(e.message, 'Nonstandard, OP_RETURN, or malformatted output');
}
>>>>>>>
try {
BTCUtilsJs.extractHash(utils.deserializeHex(opReturnOutput));
assert(false, 'expected an error');
} catch (e) {
assert.include(e.message, 'Nonstandard, OP_RETURN, or malformatted output');
}
<<<<<<<
try {
await BTCUtilsJs.extractHash(utils.deserializeHex('0x000000000000000017a914FF'));
assert(false, 'expected an error');
} catch (e) {
assert.include(e.message, 'Maliciously formatted p2sh.');
}
=======
res = BTCUtilsJs.extractHash(utils.deserializeHex('0x000000000000000017a914FF'));
assert.isNull(res);
>>>>>>>
try {
BTCUtilsJs.extractHash(utils.deserializeHex('0x000000000000000017a914FF'));
assert(false, 'expected an error');
} catch (e) {
assert.include(e.message, 'Maliciously formatted p2sh.');
}
<<<<<<<
try {
await BTCUtilsJs.extractOpReturnData(output);
assert(false, 'expected an error');
} catch (e) {
assert.include(e.message, 'Malformatted data. Must be an op return.');
}
=======
res = BTCUtilsJs.extractOpReturnData(output);
assert.isNull(res);
>>>>>>>
try {
BTCUtilsJs.extractOpReturnData(output);
assert(false, 'expected an error');
} catch (e) {
assert.include(e.message, 'Malformatted data. Must be an op return.');
} |
<<<<<<<
_init: function(net_speed)
{
this._net_speed = net_speed;
this.parent(0.0);
this._box = new St.BoxLayout();
this._icon_box = new St.BoxLayout();
this._icon = this._get_icon(this._net_speed.get_device_type(this._net_speed.getDevice()));
this._upicon = this._get_icon("up");
this._downicon = this._get_icon("down");
this._sum = new St.Label({ text: "---", style_class: 'ns-label'});
this._sumunit = new St.Label({ text: "", style_class: 'ns-unit-label'});
this._up = new St.Label({ text: "---", style_class: 'ns-label'});
this._upunit = new St.Label({ text: "", style_class: 'ns-unit-label'});
this._down = new St.Label({ text: "---", style_class: 'ns-label'});
this._downunit = new St.Label({ text: "", style_class: 'ns-unit-label'});
=======
_init: function(net_speed) {
this._net_speed = net_speed;
this.parent(0.0);
this._box = new St.BoxLayout();
this._icon_box = new St.BoxLayout();
this._icon = this._get_icon(this._net_speed.get_device_type(this._net_speed.device));
this._upicon = this._get_icon("up");
this._downicon = this._get_icon("down");
this._sum = new St.Label({ text: "---", style_class: 'ns-label', y_align: Clutter.ActorAlign.CENTER});
this._sumunit = new St.Label({ text: "", style_class: 'ns-unit-label', y_align: Clutter.ActorAlign.CENTER});
this._up = new St.Label({ text: "---", style_class: 'ns-label', y_align: Clutter.ActorAlign.CENTER});
this._upunit = new St.Label({ text: "", style_class: 'ns-unit-label', y_align: Clutter.ActorAlign.CENTER});
this._down = new St.Label({ text: "---", style_class: 'ns-label', y_align: Clutter.ActorAlign.CENTER});
this._downunit = new St.Label({ text: "", style_class: 'ns-unit-label', y_align: Clutter.ActorAlign.CENTER});
>>>>>>>
_init: function(net_speed) {
this._net_speed = net_speed;
this.parent(0.0);
this._box = new St.BoxLayout();
this._icon_box = new St.BoxLayout();
this._icon = this._get_icon(this._net_speed.get_device_type(this._net_speed.getDevice()));
this._upicon = this._get_icon("up");
this._downicon = this._get_icon("down");
this._sum = new St.Label({ text: "---", style_class: 'ns-label', y_align: Clutter.ActorAlign.CENTER});
this._sumunit = new St.Label({ text: "", style_class: 'ns-unit-label', y_align: Clutter.ActorAlign.CENTER});
this._up = new St.Label({ text: "---", style_class: 'ns-label', y_align: Clutter.ActorAlign.CENTER});
this._upunit = new St.Label({ text: "", style_class: 'ns-unit-label', y_align: Clutter.ActorAlign.CENTER});
this._down = new St.Label({ text: "---", style_class: 'ns-label', y_align: Clutter.ActorAlign.CENTER});
this._downunit = new St.Label({ text: "", style_class: 'ns-unit-label', y_align: Clutter.ActorAlign.CENTER}); |
<<<<<<<
var backButtonRoute = "#/editor/" + route1 + "/menu";
var backButtonText = "Back to menu";
=======
var backButtonRoute = "/#/editor/" + route1 + "/menu";
var backButtonText = Origin.l10n.t('app.backtomenu');
>>>>>>>
var backButtonRoute = "#/editor/" + route1 + "/menu";
var backButtonText = Origin.l10n.t('app.backtomenu');
<<<<<<<
backButtonRoute = "#/editor/" + route1 + "/page/" + Origin.previousLocation.route3;
backButtonText = "Back to page";
=======
backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3;
backButtonText = Origin.l10n.t('app.backtopage');
>>>>>>>
backButtonRoute = "#/editor/" + route1 + "/page/" + Origin.previousLocation.route3;
backButtonText = Origin.l10n.t('app.backtopage'); |
<<<<<<<
name: "Serge Stinckwich",
bio: "Enseignant-chercheur, développeur",
picture: "http://m.c.lnkd.licdn.com/mpr/mpr/shrink_200_200/p/2/000/011/381/16fa99c.jpg",
websites: [
{title: "Site web", href: "http://www.doesnotunderstand.org/"}
],
twitter: "SergeStinckwich",
contact: "[email protected]",
mail: "[email protected]",
location: "Paris",
sessions: [
{
title: "Introduction à Pharo",
summary: "Découverte de Pharo, une implémentation ouverte de Smalltalk, le langage de programmation orienté objet, dynamiquement typé et réflexif. Introduction à la syntaxe et coding dojo en Pharo."
}
],
tags: ["Smalltalk", "Programmation orientée objet", "TDD", "Test"]
},
{
=======
name: "Ameur Yannick",
bio: "Coach, Formateur Agile, Facilitateur",
picture: "http://m.c.lnkd.licdn.com/mpr/mpr/shrink_200_200/p/8/000/1dd/142/214968b.jpg",
websites: [
{title: "Site web", href: "http://www.agilenco.fr/"},
{title: "Blog Agile N Co", href: "http://yannick.ameur.free.fr/"},
{title: "LinkedIn", href: "http://fr.linkedin.com/in/yannickameur/"}
],
twitter: "yannickAmeur",
contact: "[email protected]",
mail: "[email protected]",
location: "Paris",
sessions: [
{
title: "Rétrospective",
summary: "Je vous propose d'animer et faciliter votre rétrospective sur un format d'une heure."
}
{
title: "Serious Games",
summary: "Disccuter d'un thème de votre choix sur l'agilité méthodologie ou technique. Attention brainstorming collectif animer par l'utilisation d'un sérious Game."
}
{
title: "Coaching Personnel",
summary: "Envis d'être coaché ? Vous vous posez des questions sur vos projets professionnels et personnel, offrez vous une scéance de Coaching format 45mn."
}
],
tags: ["Agile", "Scrum", "Scrumban","Coach","formation","formateur","lean","kanban","TDD", "Test"]
},
{
>>>>>>>
name: "Serge Stinckwich",
bio: "Enseignant-chercheur, développeur",
picture: "http://m.c.lnkd.licdn.com/mpr/mpr/shrink_200_200/p/2/000/011/381/16fa99c.jpg",
websites: [
{title: "Site web", href: "http://www.doesnotunderstand.org/"}
],
twitter: "SergeStinckwich",
contact: "[email protected]",
mail: "[email protected]",
location: "Paris",
sessions: [
{
title: "Introduction à Pharo",
summary: "Découverte de Pharo, une implémentation ouverte de Smalltalk, le langage de programmation orienté objet, dynamiquement typé et réflexif. Introduction à la syntaxe et coding dojo en Pharo."
}
],
tags: ["Smalltalk", "Programmation orientée objet", "TDD", "Test"]
},
{
name: "Ameur Yannick",
bio: "Coach, Formateur Agile, Facilitateur",
picture: "http://m.c.lnkd.licdn.com/mpr/mpr/shrink_200_200/p/8/000/1dd/142/214968b.jpg",
websites: [
{title: "Site web", href: "http://www.agilenco.fr/"},
{title: "Blog Agile N Co", href: "http://yannick.ameur.free.fr/"},
{title: "LinkedIn", href: "http://fr.linkedin.com/in/yannickameur/"}
],
twitter: "yannickAmeur",
contact: "[email protected]",
mail: "[email protected]",
location: "Paris",
sessions: [
{
title: "Rétrospective",
summary: "Je vous propose d'animer et faciliter votre rétrospective sur un format d'une heure."
}
{
title: "Serious Games",
summary: "Disccuter d'un thème de votre choix sur l'agilité méthodologie ou technique. Attention brainstorming collectif animer par l'utilisation d'un sérious Game."
}
{
title: "Coaching Personnel",
summary: "Envis d'être coaché ? Vous vous posez des questions sur vos projets professionnels et personnel, offrez vous une scéance de Coaching format 45mn."
}
],
tags: ["Agile", "Scrum", "Scrumban","Coach","formation","formateur","lean","kanban","TDD", "Test"]
},
{ |
<<<<<<<
, rest: {
host: 'http://localhost:3000/',
filters: {
param: [rest.RestFilters.PARAM_FILTER_PARAMS]
}
}
=======
, multilevel: {
port: process.env.LEVEL_PORT || 3000
, host: process.env.LEVEL_HOST || '127.0.0.1'
}
>>>>>>>
, multilevel: {
port: process.env.LEVEL_PORT || 3000
, host: process.env.LEVEL_HOST || '127.0.0.1'
}
, rest: {
host: 'http://localhost:3000/',
filters: {
param: [rest.RestFilters.PARAM_FILTER_PARAMS]
}
} |
<<<<<<<
this._lastMainModel = null;
this._rowEventName = query.model.adapter.name == 'mysql' ?
=======
this._itemBuffer = [];
this._rowEventName = query.model.getAdapter().name == 'mysql' ?
>>>>>>>
this._lastMainModel = null;
this._rowEventName = query.model.getAdapter().name == 'mysql' ? |
<<<<<<<
this.showFilterIcons(App.filter);
=======
;
>>>>>>>
this.showFilterIcons(App.filter);
<<<<<<<
var self = this;
var currentEl = this.$el;
var searchInput;
=======
>>>>>>>
var self = this;
var currentEl = this.$el;
var searchInput;
<<<<<<<
this.renderFilterContent();
=======
this.renderFilterContent();
this.showFilterIcons(App.filter);
>>>>>>>
this.renderFilterContent();
this.showFilterIcons(App.filter);
<<<<<<<
if (typeof (filterId) === 'object') {
filterByDefault = filterId._id;
}
=======
>>>>>>>
if (typeof (filterId) === 'object') {
filterByDefault = filterId._id;
} |
<<<<<<<
collection: qCollection,
projectId : self.id,
customerId: self.formModel.toJSON().customer._id
=======
collection: self.qCollection,
projectId : self.id
>>>>>>>
collection: self.qCollection,
projectId : self.id,
customerId: self.formModel.toJSON().customer._id |
<<<<<<<
=======
this.listenTo(Origin, 'editorSidebar:addOverviewView', this.addOverviewView);
this.listenTo(Origin, 'editorSidebar:removeEditView', this.removeEditingView);
>>>>>>>
this.listenTo(Origin, 'editorSidebar:addOverviewView', this.addOverviewView);
<<<<<<<
Origin.trigger('editorSidebar:removeEditView');
var $sidebarForm = this.$('.editor-sidebar-form');
this.hideLoadingStatus();
=======
var editor;
this.hideLoadingStatus();
>>>>>>>
Origin.trigger('editorSidebar:removeEditView');
var $sidebarForm = this.$('.edit-form');
this.hideLoadingStatus();
this.hideLoadingStatus();
<<<<<<<
=======
this.$('.edit-form').empty();
this.$('.edit-form').append(editor.$el);
this.setTab('editor-sidebar-form');
>>>>>>>
this.setTab('editor-sidebar-form'); |
<<<<<<<
date : '$date',
fileName : '$fileName',
user : '$user.login',
type : '$type',
status : '$status',
reportFile: '$reportFile'
=======
date : '$date',
fileName : '$fileName',
user : '$user.login',
type : '$type',
status : '$status',
reportFileName: '$reportFile',
reportFile : '$reportFileName'
>>>>>>>
date : '$date',
fileName : '$fileName',
user : '$user.login',
type : '$type',
status : '$status',
reportFileName: '$reportFile',
reportFile : '$reportFileName'
<<<<<<<
=======
/*ImportHistoryModel.find({}, function(err, result) {
if (err) {
return next(err);
}
res.status(200).send(result);
})*/
>>>>>>>
<<<<<<<
function (fileName, cb) {
=======
function (file, cb) {
>>>>>>>
function (file, cb) {
<<<<<<<
fileName : mapFileName,
userId : userId,
type : type,
status : 'Finished',
reportFile: fileName
=======
fileName : mapFileName,
userId : userId,
type : type,
status : 'Finished',
reportFile : file.pathName,
reportFileName: file.fileName
>>>>>>>
fileName : mapFileName,
userId : userId,
type : type,
status : 'Finished',
reportFile : file.pathName,
reportFileName: file.fileName |
<<<<<<<
dataService.getData(CONSTANTS.URLS.EMPLOYEES_GETFORDD, {isEmployee: true, devDepartments: true}, function (employees) {
=======
dataService.getData("/employee/getForDD", {
isEmployee : true,
devDepartments: true
}, function (employees) {
>>>>>>>
dataService.getData(CONSTANTS.URLS.EMPLOYEES_GETFORDD, {
isEmployee : true,
devDepartments: true
}, function (employees) {
<<<<<<<
dataService.getData(CONSTANTS.URLS.DEPARTMENTS_FORDD, {devDepartments : true}, function (departments) {
=======
dataService.getData("/department/getForDD", {devDepartments: true}, function (departments) {
>>>>>>>
dataService.getData(CONSTANTS.URLS.DEPARTMENTS_FORDD, {devDepartments : true}, function (departments) { |
<<<<<<<
=======
this.listenTo(Origin, 'editor:refreshPageList', this.addPageViews);
>>>>>>>
this.listenTo(Origin, 'editorView:refreshPageList', this.addPageViews);
<<<<<<<
postRender: function() {
},
// loop through the contentObject in the model and build the list in the overview sidebar
=======
postRender: function() {},
>>>>>>>
postRender: function() {},
<<<<<<<
=======
>>>>>>> |
<<<<<<<
=======
//var stepKey = (!this.step) ? this.stepKeys[this.step] : this.stepKeys[this.step - 1];
>>>>>>>
//var stepKey = (!this.step) ? this.stepKeys[this.step] : this.stepKeys[this.step - 1];
<<<<<<<
=======
var result;
>>>>>>>
var result;
<<<<<<<
_.each($actions, function (item, key) {
if ($(item).data('id').trim()) {
self.mergingArray.push({
id : $(item).data('id').trim(),
action : $(item).find('.active').data('action'),
existId: self.isExist
=======
if (this.step === this.stepKeys.length) {
dataService.postData(url, {
data: this.mergingArray,
headerId: this.headerId
}, function (err, result) {
if (result) {
}
self.imported += result.imported;
self.skippedArray.concat(result.skippedArray);
self.mergedCount += result.mergedCount;
linkToFile = result.reportFilePath;
linkName = result.reportFileName;
self.finishStep(linkToFile, linkName);
>>>>>>>
_.each($actions, function (item, key) {
if ($(item).data('id').trim()) {
self.mergingArray.push({
id : $(item).data('id').trim(),
action : $(item).find('.active').data('action'),
existId: self.isExist |
<<<<<<<
'constants',
'helpers/keyValidator'
], function (productItemTemplate, ProductInputContent, ProductItemsEditList, ItemsEditList, totalAmount, productCollection, GenerateWTrack, populate, helpers, dataService, CONSTANTS, keyValidator) {
=======
'constants'
], function (Backbone, $, _, productItemTemplate, ProductInputContent, ProductItemsEditList, ItemsEditList, totalAmount, productCollection, GenerateWTrack, populate, helpers, dataService, CONSTANTS) {
>>>>>>>
'constants',
'helpers/keyValidator'
], function (Backbone, $, _, productItemTemplate, ProductInputContent, ProductItemsEditList, ItemsEditList, totalAmount, productCollection, GenerateWTrack, populate, helpers, dataService, CONSTANTS, keyValidator) {
<<<<<<<
"keyup td[data-name=price] input" : 'priceChange',
'keypress .forNum' : 'keypressHandler'
=======
"mouseenter .editable:not(.quickEdit), .editable .no-long:not(.quickEdit)": "quickEdit",
"mouseleave .editable" : "removeEdit",
"mouseover .jobs" : "showDelete",
"mouseleave .jobs" : "hideDelete",
"click #cancelSpan" : "cancelClick",
"click #saveSpan" : "saveClick",
"click #editSpan" : "editClick",
"click .fa-trash-o" : 'deleteRow'
>>>>>>>
"mouseenter .editable:not(.quickEdit), .editable .no-long:not(.quickEdit)": "quickEdit",
"mouseleave .editable" : "removeEdit",
"mouseover .jobs" : "showDelete",
"mouseleave .jobs" : "hideDelete",
"click #cancelSpan" : "cancelClick",
"click #saveSpan" : "saveClick",
"click #editSpan" : "editClick",
"click .fa-trash-o" : 'deleteRow'
"keyup td[data-name=price] input" : 'priceChange',
'keypress .forNum' : 'keypressHandler'
<<<<<<<
priceChange: function (e) {
=======
editClick: function (e) {
var parent = $(e.target).closest('td');
var maxlength = parent.find(".no-long").attr("data-maxlength") || 20;
var datePicker = parent.find('.datepicker');
var textarea = parent.find('.textarea');
var prevParent = $(this.prevQuickEdit).closest("td");
var inputEl = prevParent.find('input');
if (!inputEl.length) {
inputEl = prevParent.find('textarea');
}
e.preventDefault();
if (this.prevQuickEdit) {
if ($(this.prevQuickEdit).hasClass('quickEdit')) {
$('.quickEdit').html('<span>' + (this.text ? this.text : "") + '</span>');
$('.quickEdit').removeClass('quickEdit');
}
}
if (inputEl.hasClass('datepicker')) {
prevParent.find('span').addClass('datepicker');
}
if (inputEl.hasClass('textarea')) {
prevParent.find('span').addClass('textarea');
}
//ToDo change $(..) --> this.$el.find()
$('.quickEdit #editInput').remove();
$('.quickEdit #cancelSpan').remove();
$('.quickEdit #saveSpan').remove();
parent.addClass('quickEdit');
$('#editSpan').remove();
this.text = $.trim(parent.text());
parent.text('');
if (textarea.length) {
parent.append('<textarea id="editInput" class="textarea"/>');
$('#editInput').val(this.text);
} else {
if (datePicker.length) {
parent.append('<input id="editInput" maxlength="' + maxlength + '" type="text" readonly/>');
} else if(parent.attr('data-name') === 'productDescr') {
parent.append('<input id="editInput" maxlength="' + maxlength + '" type="text"/>');
} else {
parent.append('<input id="editInput" class="forNum" maxlength="' + maxlength + '" type="text"/>'); // changed validation for numbers on keyValidator
}
$('#editInput').val(helpers.spaceReplacer(this.text));
}
if (datePicker.length) {
$('#editInput').datepicker({
dateFormat : "d M, yy",
changeMonth: true,
changeYear : true
}).addClass('datepicker');
}
this.prevQuickEdit = parent;
if (textarea.length) {
parent.append('<span id="cancelSpan" class="productEdit right"><i class="fa fa-times"></i></span>');
parent.append('<span id="saveSpan" class="productEdit right"><i class="fa fa-check"></i></span>');
} else {
parent.append('<span id="saveSpan" class="productEdit"><i class="fa fa-check"></i></span>');
parent.append('<span id="cancelSpan" class="productEdit"><i class="fa fa-times"></i></span>');
}
parent.find("#editInput").width(parent.find("#editInput").parent().width() - 55);
},
saveClick: function (e) {
>>>>>>>
priceChange: function (e) {
<<<<<<<
//parent.removeClass('quickEdit').html('<span>' + val + '</span>');
=======
parent.removeClass('quickEdit').html('<span>' + helpers.currencySplitter(val) + '</span>');
>>>>>>>
//parent.removeClass('quickEdit').html('<span>' + val + '</span>');
parent.removeClass('quickEdit').html('<span>' + helpers.currencySplitter(val) + '</span>');
<<<<<<<
$($parrents[4]).attr('class', 'editable forNum').find('span').text(salePrice);
total = parseFloat(selectedProduct.info.salePrice);
taxes = total * this.taxesRate;
subtotal = total + taxes;
taxes = taxes.toFixed(2);
subtotal = subtotal.toFixed(2);
=======
salePrice = selectedProduct.info.salePrice;
$($parrents[4]).attr('class', 'editable').find('span').text(salePrice);
total = parseFloat(selectedProduct.info.salePrice);
taxes = total * this.taxesRate;
subtotal = total + taxes;
taxes = taxes.toFixed(2);
subtotal = subtotal.toFixed(2);
>>>>>>>
salePrice = selectedProduct.info.salePrice;
$($parrents[4]).attr('class', 'editable forNum').find('span').text(salePrice);
total = parseFloat(selectedProduct.info.salePrice);
taxes = total * this.taxesRate;
subtotal = total + taxes;
taxes = taxes.toFixed(2);
subtotal = subtotal.toFixed(2);
<<<<<<<
cost = $parent.find('[data-name="price"] input').val();
=======
cost = helpers.spaceReplacer($parent.find('[data-name="price"] span').text());
>>>>>>>
cost = $parent.find('[data-name="price"] input').val();
<<<<<<<
cost = $currentEl.find('[data-name="price"] input').val();
=======
cost = helpers.spaceReplacer($currentEl.find('[data-name="price"]').text());
>>>>>>>
cost = helpers.spaceReplacer($currentEl.find('[data-name="price"]').text()); |
<<<<<<<
"text!templates/Opportunities/kanban/KanbanItemTemplate.html",
'moment',
'helpers'
=======
'Backbone',
'Underscore',
'text!templates/Opportunities/kanban/KanbanItemTemplate.html',
'moment'
>>>>>>>
'Backbone',
'Underscore',
'text!templates/Opportunities/kanban/KanbanItemTemplate.html',
'moment',
'helpers'
<<<<<<<
function (KanbanItemTemplate, moment, helpers) {
=======
function (Backbone, _, KanbanItemTemplate) {
'use strict';
>>>>>>>
function (Backbone, _, KanbanItemTemplate, helpers) {
'use strict'; |
<<<<<<<
'Backbone',
'Underscore',
'jQuery',
'views/listViewBase',
'views/selectView/selectView',
'text!templates/wTrack/list/ListHeader.html',
'text!templates/wTrack/list/cancelEdit.html',
'text!templates/wTrack/list/forWeek.html',
'views/wTrack/CreateView',
'views/wTrack/list/ListItemView',
'views/wTrack/EditView',
'views/salesInvoice/wTrack/CreateView',
'models/wTrackModel',
'collections/wTrack/filterCollection',
'collections/wTrack/editCollection',
'views/Filter/FilterView',
'views/wTrack/list/createJob',
'common',
'dataService',
'populate',
'async',
'custom',
'moment',
'constants',
'helpers/keyCodeHelper'
], function (Backbone, _, $, listViewBase, selectView, listTemplate, cancelEdit, forWeek, createView, listItemView, editView, wTrackCreateView, currentModel, contentCollection, EditCollection, filterView, CreateJob, common, dataService, populate, async, custom, moment, CONSTANTS, keyCodes) {
"use strict";
var wTrackListView = listViewBase.extend({
createView : createView,
listTemplate : listTemplate,
listItemView : listItemView,
contentCollection : contentCollection,
filterView : filterView,
contentType : 'wTrack',
viewType : 'list',
responseObj : {},
wTrackId : null, //need for edit rows in listView
totalCollectionLengthUrl: '/wTrack/totalCollectionLength',
$listTable : null, //cashedJqueryEllemnt
editCollection : null,
selectedProjectId : [],
genInvoiceEl : null,
changedModels : {},
exportToCsvUrl : '/wTrack/exportToCsv',
exportToXlsxUrl : '/wTrack/exportToXlsx',
initialize: function (options) {
this.startTime = options.startTime;
this.collection = options.collection;
this.filter = options.filter;
this.sort = options.sort;
this.defaultItemsNumber = this.collection.namberToShow || 100;
this.newCollection = options.newCollection;
this.deleteCounter = 0;
this.page = options.collection.page;
this.render();
this.getTotalLength(null, this.defaultItemsNumber, this.filter);
this.contentCollection = contentCollection;
this.stages = [];
},
events: {
"click .stageSelect" : "showNewSelect",
"click tr.enableEdit" : "editRow",
"click .newSelectList li:not(.miniStylePagination)": "chooseOption",
"change .autoCalc" : "autoCalc",
"change .editable" : "setEditable",
"keydown input.editing" : "keyDown",
"click" : "removeInputs"
},
removeInputs: function () {
// this.setChangedValueToModel();
if (this.selectView) {
this.selectView.remove();
}
},
generateJob: function (e) {
var target = $(e.target);
var id = target.closest('tr').attr('data-id');
var wTrackModel = this.editCollection.get(id) || this.collection.get(id);
var model = this.projectModel || wTrackModel.get('project');
var projectsDdContainer = $('#projectDd');
if (!model) {
projectsDdContainer.css('color', 'red');
return App.render({
type : 'error',
message: CONSTANTS.SELECTP_ROJECT
});
}
=======
'Backbone',
'Underscore',
'jQuery',
'views/listViewBase',
'views/selectView/selectView',
'text!templates/wTrack/list/ListHeader.html',
'text!templates/wTrack/list/cancelEdit.html',
'text!templates/wTrack/list/forWeek.html',
'views/wTrack/CreateView',
'views/wTrack/list/ListItemView',
'views/wTrack/EditView',
'views/salesInvoice/wTrack/CreateView',
'models/wTrackModel',
'collections/wTrack/filterCollection',
'collections/wTrack/editCollection',
'views/Filter/FilterView',
'views/wTrack/list/createJob',
'common',
'dataService',
'populate',
'async',
'custom',
'moment',
'constants',
'helpers/keyCodeHelper',
'helpers/employeeHelper'
],
function (Backbone, _, $, listViewBase, selectView, listTemplate, cancelEdit, forWeek, createView, listItemView, editView, wTrackCreateView, currentModel, contentCollection, EditCollection, filterView, CreateJob, common, dataService, populate, async, custom, moment, CONSTANTS, keyCodes, employeeHelper) {
"use strict";
var wTrackListView = listViewBase.extend({
createView : createView,
listTemplate : listTemplate,
listItemView : listItemView,
contentCollection : contentCollection,
filterView : filterView,
contentType : 'wTrack',
viewType : 'list',
responseObj : {},
wTrackId : null, //need for edit rows in listView
totalCollectionLengthUrl: '/wTrack/totalCollectionLength',
$listTable : null, //cashedJqueryEllemnt
editCollection : null,
selectedProjectId : [],
genInvoiceEl : null,
changedModels : {},
exportToCsvUrl : '/wTrack/exportToCsv',
exportToXlsxUrl : '/wTrack/exportToXlsx',
initialize: function (options) {
this.startTime = options.startTime;
this.collection = options.collection;
this.filter = options.filter;
this.sort = options.sort;
this.defaultItemsNumber = this.collection.namberToShow || 100;
this.newCollection = options.newCollection;
this.deleteCounter = 0;
this.page = options.collection.page;
this.render();
this.getTotalLength(null, this.defaultItemsNumber, this.filter);
this.contentCollection = contentCollection;
this.stages = [];
},
events: {
"click .stageSelect" : "showNewSelect",
"click tr.enableEdit" : "editRow",
"click .newSelectList li:not(.miniStylePagination)": "chooseOption",
"change .autoCalc" : "autoCalc",
"change .editable" : "setEditable",
"keydown input.editing" : "keyDown",
"click" : "removeInputs"
},
removeInputs: function () {
// this.setChangedValueToModel();
if (this.selectView) {
this.selectView.remove();
}
},
>>>>>>>
'Backbone',
'Underscore',
'jQuery',
'views/listViewBase',
'views/selectView/selectView',
'text!templates/wTrack/list/ListHeader.html',
'text!templates/wTrack/list/cancelEdit.html',
'text!templates/wTrack/list/forWeek.html',
'views/wTrack/CreateView',
'views/wTrack/list/ListItemView',
'views/wTrack/EditView',
'views/salesInvoice/wTrack/CreateView',
'models/wTrackModel',
'collections/wTrack/filterCollection',
'collections/wTrack/editCollection',
'views/Filter/FilterView',
'views/wTrack/list/createJob',
'common',
'dataService',
'populate',
'async',
'custom',
'moment',
'constants',
'helpers/keyCodeHelper',
'helpers/employeeHelper'
], function (Backbone, _, $, listViewBase, selectView, listTemplate, cancelEdit, forWeek, createView, listItemView, editView, wTrackCreateView, currentModel, contentCollection, EditCollection, filterView, CreateJob, common, dataService, populate, async, custom, moment, CONSTANTS, keyCodes, employeeHelper) {
"use strict";
var wTrackListView = listViewBase.extend({
createView : createView,
listTemplate : listTemplate,
listItemView : listItemView,
contentCollection : contentCollection,
filterView : filterView,
contentType : 'wTrack',
viewType : 'list',
responseObj : {},
wTrackId : null, //need for edit rows in listView
totalCollectionLengthUrl: '/wTrack/totalCollectionLength',
$listTable : null, //cashedJqueryEllemnt
editCollection : null,
selectedProjectId : [],
genInvoiceEl : null,
changedModels : {},
exportToCsvUrl : '/wTrack/exportToCsv',
exportToXlsxUrl : '/wTrack/exportToXlsx',
initialize: function (options) {
this.startTime = options.startTime;
this.collection = options.collection;
this.filter = options.filter;
this.sort = options.sort;
this.defaultItemsNumber = this.collection.namberToShow || 100;
this.newCollection = options.newCollection;
this.deleteCounter = 0;
this.page = options.collection.page;
this.render();
this.getTotalLength(null, this.defaultItemsNumber, this.filter);
this.contentCollection = contentCollection;
this.stages = [];
},
events: {
"click .stageSelect" : "showNewSelect",
"click tr.enableEdit" : "editRow",
"click .newSelectList li:not(.miniStylePagination)": "chooseOption",
"change .autoCalc" : "autoCalc",
"change .editable" : "setEditable",
"keydown input.editing" : "keyDown",
"click" : "removeInputs"
},
removeInputs: function () {
// this.setChangedValueToModel();
if (this.selectView) {
this.selectView.remove();
}
},
generateJob: function (e) {
var target = $(e.target);
var id = target.closest('tr').attr('data-id');
var wTrackModel = this.editCollection.get(id) || this.collection.get(id);
var model = this.projectModel || wTrackModel.get('project');
var projectsDdContainer = $('#projectDd');
if (!model) {
projectsDdContainer.css('color', 'red');
return App.render({
type : 'error',
message: CONSTANTS.SELECTP_ROJECT
});
}
<<<<<<<
this.edited = edited;
=======
this.showVacataions(td);
if (this.isEditRows()) {
this.setChangedValue();
}
>>>>>>>
this.edited = edited;
<<<<<<<
=======
}
}
function funcForWeek(cb) {
var weeks;
var month = editedElementValue;
var year = editedElement.closest('tr').find('[data-content="year"]').text();
weeks = custom.getWeeks(month, year);
>>>>>>>
<<<<<<<
employee = element._id;
=======
targetElement.attr("data-id", employee);
>>>>>>>
employee = element._id;
<<<<<<<
$('#check_all').prop('checked', false);
if (checkLength === this.collection.length) {
$('#check_all').prop('checked', true);
=======
this.setAllTotalVals();
},
saveItem: function () {
var model;
var $day;
var cls;
var tr;
var errors = this.$el.find('.errorContent');
for (var id in this.changedModels) {
model = this.editCollection.get(id) ? this.editCollection.get(id) : this.collection.get(id);
if (model) {
model.changed = this.changedModels[id];
>>>>>>>
$('#check_all').prop('checked', false);
if (checkLength === this.collection.length) {
$('#check_all').prop('checked', true);
<<<<<<<
if (rawRows.length !== 0 && rawRows.length !== checkLength) {
this.$saveBtn.hide();
=======
if (errors.length) {
return
}
this.editCollection.save();
//for (var id in this.changedModels) {
// delete this.changedModels[id];
// this.editCollection.remove(id);
//}
tr = this.$el.find('.edited');
cls = "editable autoCalc";
for (var i = 1; i <= 7; i++) {
$day = tr.find('[data-content=' + i + ']');
$day.removeClass();
$day.addClass(cls);
}
tr.removeClass('edited');
$('.vacation-legend').hide();
},
savedNewModel: function (modelObject) {
var savedRow = this.$listTable.find('.false');
var modelId;
var checkbox = savedRow.find('input[type=checkbox]');
modelObject = modelObject.success;
if (modelObject) {
modelId = modelObject._id;
savedRow.attr("data-id", modelId);
checkbox.val(modelId);
savedRow.removeAttr('id');
savedRow.removeClass('false');
}
this.hideSaveCancelBtns();
this.resetCollection(modelObject);
},
resetCollection: function (model) {
if (model && model._id) {
model = new currentModel(model);
this.collection.add(model);
>>>>>>>
if (rawRows.length !== 0 && rawRows.length !== checkLength) {
this.$saveBtn.hide();
<<<<<<<
hideNewSelect: function (e) {
// $(".newSelectList").remove();
=======
createItem: function () {
var now = new Date();
var year = now.getFullYear();
var month = now.getMonth() + 1;
var week = now.getWeek();
var $vacationLegend = $('.vacation-legend');
// var rate = 3;
var startData = {
year : year,
month : month,
week : week,
//rate : rate,
projectModel: null
};
>>>>>>>
hideNewSelect: function (e) {
// $(".newSelectList").remove(); |
<<<<<<<
function (listTemplate, cancelEdit, createView, listItemView, editView, wTrackCreateView, currentModel, usersModel, contentCollection, EditCollection, filterView, common, dataService, populate, async, custom, moment) {
=======
function (paginationTemplate, listTemplate, cancelEdit, createView, listItemView, editView, wTrackCreateView, currentModel, contentCollection, EditCollection, filterView, common, dataService, populate, async, custom) {
>>>>>>>
function (listTemplate, cancelEdit, createView, listItemView, editView, wTrackCreateView, currentModel, contentCollection, EditCollection, filterView, common, dataService, populate, async, custom, moment) { |
<<<<<<<
showMore : function () {
=======
showMore : function (event) {
//event.preventDefault();
>>>>>>>
showMore : function () {
showMore : function (event) {
//event.preventDefault();
<<<<<<<
//todo change after routes refactoring
window.location = '/Customers/exportToCsv?type=Person';
=======
var tempExportToCsvUrl = '';
if (this.exportToCsvUrl) {
tempExportToCsvUrl = this.exportToCsvUrl;
if (this.filter) {
tempExportToCsvUrl += '&filter=' + encodeURIComponent(JSON.stringify(this.filter));
}
window.location = tempExportToCsvUrl;
}
>>>>>>>
var tempExportToCsvUrl = '';
if (this.exportToCsvUrl) {
tempExportToCsvUrl = this.exportToCsvUrl;
if (this.filter) {
tempExportToCsvUrl += '&filter=' + encodeURIComponent(JSON.stringify(this.filter));
}
window.location = tempExportToCsvUrl;
}
<<<<<<<
//todo change after routes refactoring
window.location = '/Customers/exportToXlsx?type=Person';
=======
var tempExportToXlsxUrl = '';
if (this.exportToXlsxUrl) {
tempExportToXlsxUrl = this.exportToXlsxUrl;
if (this.filter) {
tempExportToXlsxUrl += '&filter=' + encodeURIComponent(JSON.stringify(this.filter));
}
window.location = tempExportToXlsxUrl;
}
>>>>>>>
var tempExportToXlsxUrl = '';
if (this.exportToXlsxUrl) {
tempExportToXlsxUrl = this.exportToXlsxUrl;
if (this.filter) {
tempExportToXlsxUrl += '&filter=' + encodeURIComponent(JSON.stringify(this.filter));
}
window.location = tempExportToXlsxUrl;
} |
<<<<<<<
'views/Notes/NoteView',
=======
'text!templates/Employees/EditTransferTemplate.html',
'views/Notes/AttachView',
>>>>>>>
'text!templates/Employees/EditTransferTemplate.html',
'views/Notes/NoteView',
<<<<<<<
NoteView,
=======
EditTransferTemplate,
AttachView,
>>>>>>>
EditTransferTemplate,
NoteView,
<<<<<<<
$.each($jobTrs, function (index, $tr) {
var $previousTr;
$tr = $thisEl.find($tr);
salary = self.isSalary ? parseInt(helpers.spaceReplacer($tr.find('[data-id="salary"] input').val() || $tr.find('[data-id="salary"]').text()), 10) : null;
manager = $tr.find('#projectManagerDD').attr('data-id') || null;
date = $.trim($tr.find('td').eq(2).text());
date = date ? new Date(date) : new Date();
jobPosition = $tr.find('#jobPositionDd').attr('data-id');
department = $tr.find('#departmentsDd').attr('data-id');
weeklyScheduler = $tr.find('#weeklySchedulerDd').attr('data-id');
jobType = $.trim($tr.find('#jobTypeDd').text());
info = $tr.find('#statusInfoDd').val();
event = $tr.attr('data-content');
if (haveSalary) {
if (!previousDep) {
previousDep = department;
}
if (previousDep !== department) {
$previousTr = self.$el.find($jobTrs[index - 1]);
transferArray.push({
status : 'transfer',
date : moment(date).subtract(1, 'day'),
department : previousDep,
jobPosition : $previousTr.find('#jobPositionDd').attr('data-id') || null,
manager : $previousTr.find('#projectManagerDD').attr('data-id') || null,
jobType : $.trim($previousTr.find('#jobTypeDd').text()),
salary : salary,
info : $previousTr.find('#statusInfoDd').val(),
weeklyScheduler: $previousTr.find('#weeklySchedulerDd').attr('data-id')
});
previousDep = department;
}
transferArray.push({
status : event,
date : date,
department : department,
jobPosition : jobPosition,
manager : manager,
jobType : jobType,
salary : salary,
info : info,
weeklyScheduler: weeklyScheduler
});
=======
manager = $jobTrs.find('#projectManagerDD').last().attr('data-id') || null;
jobPosition = $jobTrs.find('#jobPositionDd').last().attr('data-id');
department = $jobTrs.find('#departmentsDd').last().attr('data-id');
weeklyScheduler = $jobTrs.find('#weeklySchedulerDd').last().attr('data-id');
event = $jobTrs.last().attr('data-content');
jobType = $.trim($jobTrs.last().find('#jobTypeDd').text());
date = $.trim($jobTrs.last().find('td').eq(2).text());
date = date ? helpers.setTimeToDate(new Date(date)) : helpers.setTimeToDate(new Date());
>>>>>>>
manager = $jobTrs.find('#projectManagerDD').last().attr('data-id') || null;
jobPosition = $jobTrs.find('#jobPositionDd').last().attr('data-id');
department = $jobTrs.find('#departmentsDd').last().attr('data-id');
weeklyScheduler = $jobTrs.find('#weeklySchedulerDd').last().attr('data-id');
event = $jobTrs.last().attr('data-content');
jobType = $.trim($jobTrs.last().find('#jobTypeDd').text());
date = $.trim($jobTrs.last().find('td').eq(2).text());
date = date ? helpers.setTimeToDate(new Date(date)) : helpers.setTimeToDate(new Date()); |
<<<<<<<
router.post('/create', handler.create);
router.post('/uploadFiles', accessStackMiddleware, multipartMiddleware, iHandler.uploadFile);
=======
router.post('/', handler.create);
>>>>>>>
router.post('/', handler.create);
router.post('/uploadFiles', accessStackMiddleware, multipartMiddleware, iHandler.uploadFile); |
<<<<<<<
if (aggregatePurchase) {
aggregate = [
{
$lookup: {
from : supplier,
localField : 'supplier',
foreignField: '_id',
as : 'supplier'
=======
Payment.aggregate([{
$lookup: {
from : supplier,
localField : 'supplier',
foreignField: '_id',
as : 'supplier'
}
}, {
$lookup: {
from : 'Invoice',
localField : 'invoice',
foreignField: '_id',
as : 'invoice'
}
}, {
$lookup: {
from : paymentMethod,
localField : 'paymentMethod',
foreignField: '_id',
as : 'paymentMethod'
}
}, {
$lookup: {
from : 'journals',
localField : 'journal',
foreignField: '_id',
as : 'journal'
}
}, {
$lookup: {
from : 'currency',
localField : 'currency._id',
foreignField: '_id',
as : 'currency.obj'
}
}, {
$project: {
supplier : {$arrayElemAt: ['$supplier', 0]},
invoice : {$arrayElemAt: ['$invoice', 0]},
paymentMethod : {$arrayElemAt: ['$paymentMethod', 0]},
journal : {$arrayElemAt: ['$journal', 0]},
'currency.obj' : {$arrayElemAt: ['$currency.obj', 0]},
'currency.rate' : 1,
forSale : 1,
differenceAmount: 1,
paidAmount : 1,
workflow : 1,
name : 1,
date : 1,
isExpense : 1,
bonus : 1,
paymentRef : 1,
year : 1,
month : 1,
period : 1,
_type : 1
}
}, {
$lookup: {
from : 'projectMembers',
localField : 'invoice.project',
foreignField: 'projectId',
as : 'projectMembers'
}
}, {
$lookup: {
from : 'workflows',
localField : 'invoice.workflow',
foreignField: '_id',
as : 'invoice.workflow'
}
}, {
$project: {
'supplier.name' : '$supplier.name',
'supplier._id' : '$supplier._id',
'journal.name' : '$journal.name',
'journal._id' : '$journal._id',
'currency.name' : '$currency.obj.name',
'currency._id' : '$currency.obj._id',
'currency.rate' : 1,
'invoice._id' : 1,
'invoice.name' : 1,
'invoice.workflow': {$arrayElemAt: ['$invoice.workflow', 0]},
salesmanagers: {
$filter: {
input: '$projectMembers',
as : 'projectMember',
cond : salesManagerMatch
>>>>>>>
if (aggregatePurchase) {
aggregate = [
{
$lookup: {
from : supplier,
localField : 'supplier',
foreignField: '_id',
as : 'supplier'
<<<<<<<
currencyModel : {$arrayElemAt: ['$currency._id', 0]},
=======
journal : 1,
'currencyModel' : {$arrayElemAt: ['$currency._id', 0]},
>>>>>>>
currencyModel : {$arrayElemAt: ['$currency._id', 0]},
journal : 1, |
<<<<<<<
DASH_VAC_WEEK_AFTER: 8,
DASH_VAC_WEEK_AFTER: 8,
COUNT_PER_PAGE: 100,
BANED_PROFILE: "1387275504000"
=======
DASH_VAC_WEEK_AFTER: 8,
HR_VAC_YEAR_BEFORE: 2,
HR_VAC_YEAR_AFTER: 1,
>>>>>>>
DASH_VAC_WEEK_AFTER: 8,
DASH_VAC_WEEK_AFTER: 8,
HR_VAC_YEAR_BEFORE: 2,
HR_VAC_YEAR_AFTER: 1,
COUNT_PER_PAGE: 100,
BANED_PROFILE: "1387275504000" |
<<<<<<<
/**
*@api {get} /opportunities/getFilterValues Request FilterValues
*
* @apiVersion 0.0.1
* @apiName getFilterValues
* @apiGroup Opportunity
*
* @apiSuccess {Object} FilterValues
* @apiSuccessExample Success-Response:
HTTP/1.1 200 OK
[
{
"_id": null,
"Name": [
".net devs",
"APP Project",
"AR/VR Store",
...
],
"Creation date": [
"2016-07-12T13:14:28.804Z",
"2016-07-12T09:42:36.899Z",
...
],
"Expected revenue": [
0,
200,
300,
640,
1000,
...
]
}
]
*/
=======
router.get('/getForDd', authStackMiddleware, accessStackMiddleware, handler.getForDd);
>>>>>>>
/**
*@api {get} /opportunities/getFilterValues Request FilterValues
*
* @apiVersion 0.0.1
* @apiName getFilterValues
* @apiGroup Opportunity
*
* @apiSuccess {Object} FilterValues
* @apiSuccessExample Success-Response:
HTTP/1.1 200 OK
[
{
"_id": null,
"Name": [
".net devs",
"APP Project",
"AR/VR Store",
...
],
"Creation date": [
"2016-07-12T13:14:28.804Z",
"2016-07-12T09:42:36.899Z",
...
],
"Expected revenue": [
0,
200,
300,
640,
1000,
...
]
}
]
*/
router.get('/getForDd', authStackMiddleware, accessStackMiddleware, handler.getForDd);
<<<<<<<
/**
*@api {post} /opportunities/ Request for creating new Opportunity
*
* @apiVersion 0.0.1
* @apiName createNewOpportunity
* @apiGroup Opportunity
*
* @apiParamExample {json} Request-Example:
{
"isOpportunitie": true,
"name": "Android",
"expectedRevenue": {
"value": "0",
"currency": "$"
},
"company": {
"id": "",
"name": ""
},
"contactName": {
"first": "",
"last": ""
},
"customer": "570b65d718efef5454b6b58d",
"address": {
"street": "201 W. Main Street, Suite 100",
"city": "Durham",
"state": "NC",
"zip": "27701",
"country": "USA"
},
"email": "",
"phones": {
"mobile": "",
"phone": "",
"fax": ""
},
"func": "",
"salesPerson": "56b8b99e6c411b590588feb9",
"salesTeam": null,
"internalNotes": "",
"nextAction": {
"desc": ""
},
"expectedClosing": "21 Jul, 2016",
"priority": "Low",
"categories": "",
"active": true,
"optout": false,
"reffered": "",
"workflow": "528cdcb4f3f67bc40b000006",
"whoCanRW": "everyOne",
"groups": {
"owner": null,
"users": [
],
"group": [
]
}
}
* @apiSuccess {Object} Status
* @apiSuccessExample Success-Response:
HTTP/1.1 201 Created
{
"success": "A new Opportunities create success",
"id": "578508a3b7c30f675048cdae"
}
*/
=======
router.get('/:id',authStackMiddleware, accessStackMiddleware, handler.getById);
>>>>>>>
router.get('/:id',authStackMiddleware, accessStackMiddleware, handler.getById); |
<<<<<<<
if (!this.filter) {
this.filter = {};
}
this.filter['letter'] = {
key : 'letter',
value: selectedLetter,
type : null
};
=======
>>>>>>>
if (!this.filter) {
this.filter = {};
}
this.filter['letter'] = {
key : 'letter',
value: selectedLetter,
type : null
};
<<<<<<<
hideItemsNumber : function (e) {
var el = this.$(e.target); // changed after ui test
=======
hideItemsNumber: function (e) {
var el = this.$(e.target); // changed after ui test
>>>>>>>
hideItemsNumber : function (e) {
var el = this.$(e.target); // changed after ui test
<<<<<<<
if (showMore.length != 0) {
=======
if (showMore.length !== 0) {
>>>>>>>
if (showMore.length !== 0) {
<<<<<<<
=======
>>>>>>>
<<<<<<<
var currentLetter = (self.filter) ? self.filter.letter.value : null;
=======
var currentLetter = (self.filter) ? self.filter.letter : null;
>>>>>>>
var currentLetter = (self.filter) ? self.filter.letter.value : null; |
<<<<<<<
var access = require('../Modules/additions/access.js')(models);
var ProjectSchema = mongoose.Schemas.Project;
var wTrackSchema = mongoose.Schemas.wTrack;
var MonthHoursSchema = mongoose.Schemas.MonthHours;
var EmployeeSchema = mongoose.Schemas.Employee;
var jobsSchema = mongoose.Schemas.jobs;
=======
var access = require("../Modules/additions/access.js")(models);
var ProjectSchema = mongoose.Schemas['Project'];
var wTrackSchema = mongoose.Schemas['wTrack'];
var wTrackInvoiceSchema = mongoose.Schemas.wTrackInvoice;
var MonthHoursSchema = mongoose.Schemas['MonthHours'];
var EmployeeSchema = mongoose.Schemas['Employee'];
var jobsSchema = mongoose.Schemas['jobs'];
>>>>>>>
var access = require('../Modules/additions/access.js')(models);
var ProjectSchema = mongoose.Schemas.Project;
var wTrackSchema = mongoose.Schemas.wTrack;
var MonthHoursSchema = mongoose.Schemas.MonthHours;
var EmployeeSchema = mongoose.Schemas.Employee;
var wTrackInvoiceSchema = mongoose.Schemas.wTrackInvoice;
var jobsSchema = mongoose.Schemas.jobs; |
<<<<<<<
//require('./monthHours.js');
=======
require('./monthHours.js');
require('./holiday.js');
>>>>>>>
//require('./monthHours.js');
require('./holiday.js'); |
<<<<<<<
var sendData = function (url, data, method, callback, contentType) {
=======
var sendData = function (url, data, method, contentType, callback) {
var ajaxObject;
>>>>>>>
var sendData = function (url, data, method, callback, contentType) {
var ajaxObject;
<<<<<<<
//contentType: contentType,
=======
>>>>>>> |
<<<<<<<
router.get('/writeOff', _journalHandler.getWriteOff);
=======
router.get('/getByAccount', _journalHandler.getByAccount);
>>>>>>>
router.get('/writeOff', _journalHandler.getWriteOff);
router.get('/getByAccount', _journalHandler.getByAccount); |
<<<<<<<
chooseOption: function (e) {
var holder = $(e.target).parents('dd').find('.current-selected');
holder.text($(e.target).text()).attr('data-id', $(e.target).attr('id'));
$(e.target).closest('td').removeClass('errorContent');
},
=======
chooseOption: function (e) {
var currencyElement = $(e.target).parents('dd').find('.current-selected');
var oldCurrency = currencyElement.attr('data-id');
var newCurrency = $(e.target).attr('id');
var oldCurrencyClass = helpers.currencyClass(oldCurrency);
var newCurrencyClass = helpers.currencyClass(newCurrency);
var array = this.$el.find('.' + oldCurrencyClass);
array.removeClass(oldCurrencyClass).addClass(newCurrencyClass);
currencyElement.text($(e.target).text()).attr('data-id', newCurrency);
},
>>>>>>>
chooseOption: function (e) {
var holder = $(e.target).parents('dd').find('.current-selected');
var currencyElement = $(e.target).parents('dd').find('.current-selected');
var oldCurrency = currencyElement.attr('data-id');
var newCurrency = $(e.target).attr('id');
var oldCurrencyClass = helpers.currencyClass(oldCurrency);
var newCurrencyClass = helpers.currencyClass(newCurrency);
var array = this.$el.find('.' + oldCurrencyClass);
array.removeClass(oldCurrencyClass).addClass(newCurrencyClass);
currencyElement.text($(e.target).text()).attr('data-id', newCurrency);
holder.text($(e.target).text()).attr('data-id', $(e.target).attr('id'));
$(e.target).closest('td').removeClass('errorContent');
}, |
<<<<<<<
'jQuery',
'Underscore',
'views/listViewBase',
'text!templates/Companies/list/ListHeader.html',
'views/Companies/CreateView',
'views/Companies/list/ListItemView',
'collections/Companies/filterCollection',
'views/Filter/FilterView',
'common',
'constants'
],
function ($, _, listViewBase, listTemplate, createView, listItemView, contentCollection, FilterView, common, CONSTANTS) {
'use strict';
var CompaniesListView = listViewBase.extend({
createView : createView,
listTemplate : listTemplate,
listItemView : listItemView,
contentCollection : contentCollection,
FilterView : FilterView,
contentType : "Companies",
totalCollectionLengthUrl: '/companies/totalCollectionLength',
formUrl : "#easyErp/Companies/form/",
exportToXlsxUrl : '/Customers/exportToXlsx/?type=Companies',
exportToCsvUrl : '/Customers/exportToCsv/?type=Companies',
events: {
"click .letter:not(.empty)": "alpabeticalRender"
},
initialize: function (options) {
this.mId = CONSTANTS.MID[this.contentType];
this.startTime = options.startTime;
this.collection = options.collection;
_.bind(this.collection.showMore, this.collection);
_.bind(this.collection.showMoreAlphabet, this.collection);
this.allAlphabeticArray = common.buildAllAphabeticArray();
this.filter = options.filter;
this.defaultItemsNumber = this.collection.namberToShow || 100;
this.newCollection = options.newCollection;
this.deleteCounter = 0;
this.page = options.collection.page;
this.render();
this.getTotalLength(null, this.defaultItemsNumber, this.filter);
this.contentCollection = contentCollection;
},
exportToXlsx: function () {
var tempExportToXlsxUrl = '';
if (this.exportToXlsxUrl) {
tempExportToXlsxUrl = this.exportToXlsxUrl;
if (this.filter) {
tempExportToXlsxUrl += '&filter=' + encodeURIComponent(JSON.stringify(this.filter));
}
window.location = tempExportToXlsxUrl;
=======
'jQuery',
'Underscore',
'views/listViewBase',
'text!templates/Companies/list/ListHeader.html',
'views/Companies/CreateView',
'views/Companies/list/ListItemView',
'collections/Companies/filterCollection',
'views/Filter/FilterView',
'common',
'constants'
], function ($, _, listViewBase, listTemplate, CreateView, ListItemView, contentCollection, FilterView, common, CONSTANTS) {
'use strict';
var CompaniesListView = listViewBase.extend({
CreateView : CreateView,
listTemplate : listTemplate,
ListItemView : ListItemView,
contentCollection : contentCollection,
filterView : FilterView,
contentType : 'Companies',
totalCollectionLengthUrl: '/companies/totalCollectionLength',
formUrl : '#easyErp/Companies/form/',
exportToXlsxUrl : '/Customers/exportToXlsx/?type=Companies',
exportToCsvUrl : '/Customers/exportToCsv/?type=Companies',
events: {
'click .letter:not(.empty)': 'alpabeticalRender'
},
initialize: function (options) {
this.mId = CONSTANTS.MID[this.contentType];
this.startTime = options.startTime;
this.collection = options.collection;
//_.bind(this.collection.showMore, this.collection);
_.bind(this.collection.showMoreAlphabet, this.collection);
this.allAlphabeticArray = common.buildAllAphabeticArray();
this.filter = options.filter;
this.defaultItemsNumber = this.collection.namberToShow || 100;
this.newCollection = options.newCollection;
this.deleteCounter = 0;
this.page = options.collection.currentPage;
this.render();
// this.getTotalLength(null, this.defaultItemsNumber, this.filter);
this.contentCollection = contentCollection;
},
exportToXlsx: function () {
var tempExportToXlsxUrl = '';
if (this.exportToXlsxUrl) {
tempExportToXlsxUrl = this.exportToXlsxUrl;
if (this.filter) {
tempExportToXlsxUrl += '&filter=' + encodeURIComponent(JSON.stringify(this.filter));
>>>>>>>
'jQuery',
'Underscore',
'views/listViewBase',
'text!templates/Companies/list/ListHeader.html',
'views/Companies/CreateView',
'views/Companies/list/ListItemView',
'collections/Companies/filterCollection',
'views/Filter/FilterView',
'common',
'constants'
], function ($, _, listViewBase, listTemplate, CreateView, ListItemView, contentCollection, FilterView, common, CONSTANTS) {
'use strict';
var CompaniesListView = listViewBase.extend({
CreateView : CreateView,
listTemplate : listTemplate,
ListItemView : ListItemView,
contentCollection : contentCollection,
FilterView : FilterView,
contentType : 'Companies',
totalCollectionLengthUrl: '/companies/totalCollectionLength',
formUrl : '#easyErp/Companies/form/',
exportToXlsxUrl : '/Customers/exportToXlsx/?type=Companies',
exportToCsvUrl : '/Customers/exportToCsv/?type=Companies',
events: {
'click .letter:not(.empty)': 'alpabeticalRender'
},
initialize: function (options) {
this.mId = CONSTANTS.MID[this.contentType];
this.startTime = options.startTime;
this.collection = options.collection;
//_.bind(this.collection.showMore, this.collection);
_.bind(this.collection.showMoreAlphabet, this.collection);
this.allAlphabeticArray = common.buildAllAphabeticArray();
this.filter = options.filter;
this.defaultItemsNumber = this.collection.namberToShow || 100;
this.newCollection = options.newCollection;
this.deleteCounter = 0;
this.page = options.collection.currentPage;
this.render();
// this.getTotalLength(null, this.defaultItemsNumber, this.filter);
this.contentCollection = contentCollection;
},
exportToXlsx: function () {
var tempExportToXlsxUrl = '';
if (this.exportToXlsxUrl) {
tempExportToXlsxUrl = this.exportToXlsxUrl;
if (this.filter) {
tempExportToXlsxUrl += '&filter=' + encodeURIComponent(JSON.stringify(this.filter)); |
<<<<<<<
function (Backbone, $, _, ProjectsFormTemplate, DetailsTemplate, ProformRevenueTemplate, jobsWTracksTemplate, invoiceStats, ReportView, selectView, EditViewOrder, editViewQuotation, editViewInvoice, EditView, noteView, attachView, AssigneesView, BonusView, wTrackView, PaymentView, InvoiceView, QuotationView, GenerateWTrack, oredrView, wTrackCollection, quotationCollection, invoiceCollection, paymentCollection, jobsCollection, quotationModel, invoiceModel, addAttachTemplate, common, populate, custom, dataService, async, helpers) {
=======
function (Backbone, $, _, ProjectsFormTemplate, DetailsTemplate, ProformRevenueTemplate, jobsWTracksTemplate, invoiceStats, selectView, EditViewOrder, editViewQuotation, editViewInvoice, EditView, noteView, attachView, AssigneesView, BonusView, wTrackView, SalesManagersView, PaymentView, InvoiceView, QuotationView, GenerateWTrack, oredrView, wTrackCollection, quotationCollection, invoiceCollection, paymentCollection, jobsCollection, quotationModel, invoiceModel, addAttachTemplate, common, populate, custom, dataService, async, helpers) {
>>>>>>>
function (Backbone, $, _, ProjectsFormTemplate, DetailsTemplate, ProformRevenueTemplate, jobsWTracksTemplate, invoiceStats, ReportView, selectView, EditViewOrder, editViewQuotation, editViewInvoice, EditView, noteView, attachView, AssigneesView, BonusView, wTrackView, SalesManagersView, PaymentView, InvoiceView, QuotationView, GenerateWTrack, oredrView, wTrackCollection, quotationCollection, invoiceCollection, paymentCollection, jobsCollection, quotationModel, invoiceModel, addAttachTemplate, common, populate, custom, dataService, async, helpers) {
<<<<<<<
'click .chart-tabs' : 'changeTab',
'click .deleteAttach' : 'deleteAttach',
"click #health a:not(.disabled)" : "showHealthDd",
"click #health ul li div:not(.disabled)" : "chooseHealthDd",
"click .newSelectList li:not(.miniStylePagination):not(.disabled)" : "chooseOption",
"click .current-selected:not(.disabled)" : "showNewSelect",
"click #createItem" : "createDialog",
"click #createJob" : "createJob",
"change input:not(.checkbox, .check_all, #check_all_bonus, .statusCheckbox, #inputAttach, #noteTitleArea)": "showSaveButton", // added id for noteView
"change #description" : "showSaveButton",
"click .expand" : "renderJobWTracks",
"mouseover #jobsItem" : "showRemoveButton",
"mouseleave #jobsItem" : "hideRemoveButton",
"click .fa.fa-trash" : "removeJobAndWTracks",
"dblclick td.editableJobs" : "editRow",
"click .report" : "showReport",
"click #saveName" : "saveNewJobName",
"keydown input.editing " : "keyDown",
'click' : 'hideSelect',
'keydown' : 'keydownHandler',
"click a.quotation" : "viewQuotation",
"click a.invoice" : "viewInvoice"
=======
'click .chart-tabs' : 'changeTab',
'click .deleteAttach' : 'deleteAttach',
"click #health a:not(.disabled)" : "showHealthDd",
"click #health ul li div:not(.disabled)" : "chooseHealthDd",
"click .newSelectList li:not(.miniStylePagination):not(.disabled)" : "chooseOption",
"click .current-selected:not(.disabled)" : "showNewSelect",
"click #createItem" : "createDialog",
"click #createJob" : "createJob",
"change input:not(.checkbox, .bonus-checkbox, .check_all, #check_all_bonus, .statusCheckbox, #inputAttach, #noteTitleArea)" : "showSaveButton", // added id for noteView
"change #description" : "showSaveButton",
"click #jobsItem td:not(.selects, .remove, a.quotation, a.invoice)" : "renderJobWTracks",
"mouseover #jobsItem" : "showRemoveButton",
"mouseleave #jobsItem" : "hideRemoveButton",
"click .fa.fa-trash" : "removeJobAndWTracks",
"dblclick td.editableJobs" : "editRow",
"click #saveName" : "saveNewJobName",
"keydown input.editing " : "keyDown",
'click' : 'hideSelect',
'keydown' : 'keydownHandler',
"click a.quotation" : "viewQuotation",
"click a.invoice" : "viewInvoice"
>>>>>>>
'click .chart-tabs' : 'changeTab',
'click .deleteAttach' : 'deleteAttach',
"click #health a:not(.disabled)" : "showHealthDd",
"click #health ul li div:not(.disabled)" : "chooseHealthDd",
"click .newSelectList li:not(.miniStylePagination):not(.disabled)" : "chooseOption",
"click .current-selected:not(.disabled)" : "showNewSelect",
"click #createItem" : "createDialog",
"click #createJob" : "createJob",
"change input:not(.checkbox, .bonus-checkbox, .check_all, #check_all_bonus, .statusCheckbox, #inputAttach, #noteTitleArea)" : "showSaveButton", // added id for noteView
"change #description" : "showSaveButton",
"click #jobsItem td:not(.selects, .remove, a.quotation, a.invoice)" : "renderJobWTracks",
"mouseover #jobsItem" : "showRemoveButton",
"mouseleave #jobsItem" : "hideRemoveButton",
"click .fa.fa-trash" : "removeJobAndWTracks",
"dblclick td.editableJobs" : "editRow",
"click #saveName" : "saveNewJobName",
"keydown input.editing " : "keyDown",
'click' : 'hideSelect',
'keydown' : 'keydownHandler',
"click a.quotation" : "viewQuotation",
"click .report" : "showReport",
"click a.invoice" : "viewInvoice" |
<<<<<<<
'text!templates/Notes/importTemplate.html',
'views/Notes/AttachView',
=======
'views/Import/mappingContentView',
>>>>>>>
'text!templates/Notes/importTemplate.html',
'views/Notes/AttachView',
'views/Import/mappingContentView',
<<<<<<<
], function (Backbone, $, _, ContentTemplate, ImportProgressTemplate, ImportTemplate, AttachView, CONSTANTS, common) {
=======
], function (Backbone, $, _, ContentTemplate, ImportProgressTemplate, MappingContentView, CONSTANTS, common) {
>>>>>>>
], function (Backbone, $, _, ContentTemplate, ImportProgressTemplate, ImportTemplate, AttachView, MappingContentView, CONSTANTS, common) {
<<<<<<<
importFile: function (e) {
var $thisEl = this.$el;
e.preventDefault();
$thisEl.find('#forImport').html(this.importTemplate);
$thisEl.find('#inputAttach').click();
},
importFiles: function (e) {
var importFile = new AttachView({el: '#forImport'});
importFile.sendToServer(e, null, this);
},
=======
goToMapping: function () {
var $thisEl = this.$el;
this.childView = new MappingContentView();
},
>>>>>>>
importFile: function (e) {
var $thisEl = this.$el;
e.preventDefault();
$thisEl.find('#forImport').html(this.importTemplate);
$thisEl.find('#inputAttach').click();
},
importFiles: function (e) {
var importFile = new AttachView({el: '#forImport'});
importFile.sendToServer(e, null, this);
},
goToMapping: function () {
var $thisEl = this.$el;
this.childView = new MappingContentView();
}, |
<<<<<<<
year = year.slice(0, 4);
=======
if (!isOvertime && holiday){
App.render({
type : 'error',
message: 'Please create Overtime tCard'
});
return false;
}
>>>>>>>
year = year.slice(0, 4);
if (!isOvertime && holiday){
App.render({
type : 'error',
message: 'Please create Overtime tCard'
});
return false;
} |
<<<<<<<
this.listenTo(Origin, 'editorSidebar:removeEditView', this.remove);
=======
this.listenTo(Origin, 'editor:removeSubViews', this.remove);
this.model.set('ancestors', this.model.getPossibleAncestors().toJSON());
>>>>>>>
this.listenTo(Origin, 'editorSidebarView:removeEditView', this.remove);
this.listenTo(Origin, 'editorView:removeSubViews', this.remove);
this.model.set('ancestors', this.model.getPossibleAncestors().toJSON());
<<<<<<<
Origin.trigger('editorView:fetchData');
//Backbone.history.navigate('/editor/page/' + model.get('_parentId'), {trigger: true});
=======
Origin.trigger('editor:fetchData');
>>>>>>>
Origin.trigger('editorView:fetchData'); |
<<<<<<<
'views/Filter/FilterValuesView',
'collections/Filter/filterCollection',
=======
'views/Filter/savedFiltersView',
>>>>>>>
'views/Filter/FilterValuesView',
'collections/Filter/filterCollection',
'views/Filter/savedFiltersView',
<<<<<<<
'common',
'constants'
=======
'common',
>>>>>>>
'common'
<<<<<<<
function (ContentFilterTemplate, valuesView, filterValuesCollection, Custom, Common, CONSTANTS) {
=======
function (ContentFilterTemplate, savedFiltersView, Custom, Common) {
>>>>>>>
function (ContentFilterTemplate, valuesView, filterValuesCollection, savedFiltersView, Custom, Common, CONSTANTS) {
<<<<<<<
this.parentContentType = options.contentType;
this.constantsObject = CONSTANTS.FILTERS[this.parentContentType];
this.filterObject = App.filtersValues[this.parentContentType];
this.filter = {};
this.currentCollection = {};
this.render();
=======
this.render(options);
>>>>>>>
this.parentContentType = options.contentType;
this.constantsObject = CONSTANTS.FILTERS[this.parentContentType];
this.filterObject = App.filtersValues[this.parentContentType];
this.filter = {};
this.currentCollection = {};
this.render();
<<<<<<<
if (!this.filter[groupType]) {
this.filter[groupType] = [];
}
this.filter[groupType].push(currentValue);
collectionElement = currentCollection.findWhere({_id: currentValue});
collectionElement.set({status: true});
groupNameElement.addClass('checkedGroup');
} else {
var index = this.filter[groupType].indexOf(currentValue);
if (index >= 0) {
this.filter[groupType].splice( index, 1 );
if (this.filter[groupType].length === 0) {
delete this.filter[groupType];
}
};
}
this.trigger('filter', this.filter);
},
showHideValues: function (e) {
var filterGroupContainer = $(e.target).closest('.filterGroup');
filterGroupContainer.find('.ulContent').toggleClass('hidden');
filterGroupContainer.toggleClass('activeGroup');
},
render: function () {
var filtersGroupContainer;
var self = this;
var keys = Object.keys(this.constantsObject);
//var currentCollection;
var filterKey;
var filterBackend;
var itemView;
this.$el.html(this.template({filterCollection: this.constantsObject}));
filtersGroupContainer = $(this.el).find('#filtersContent');
filtersGroupContainer.html('');
if (keys.length) {
keys.forEach(function (key) {
filterKey = self.constantsObject[key].view;
filterBackend = self.constantsObject[key].backend;
self.currentCollection[filterKey] = new filterValuesCollection(self.filterObject[filterKey]);
//currentCollection = currentCollection.toJSON();
//this.collection[]
itemView = new valuesView({
groupName: key,
currentCollection: self.currentCollection[filterKey],
backendString: filterBackend
})
filtersGroupContainer.append(itemView);
});
};
=======
this.contentType = 'wTrack';//options.contentType;//ToDo contentType
this.$el.html(this.template({collection: this.collection, customCollection: options.customCollection}));
var savedFiltersView = new savedFiltersView({
contentType: this.contentType,
filter: this.filter
});
>>>>>>>
if (!this.filter[groupType]) {
this.filter[groupType] = [];
}
this.filter[groupType].push(currentValue);
collectionElement = currentCollection.findWhere({_id: currentValue});
collectionElement.set({status: true});
groupNameElement.addClass('checkedGroup');
} else {
var index = this.filter[groupType].indexOf(currentValue);
if (index >= 0) {
this.filter[groupType].splice( index, 1 );
if (this.filter[groupType].length === 0) {
delete this.filter[groupType];
}
};
}
this.trigger('filter', this.filter);
},
showHideValues: function (e) {
var filterGroupContainer = $(e.target).closest('.filterGroup');
filterGroupContainer.find('.ulContent').toggleClass('hidden');
filterGroupContainer.toggleClass('activeGroup');
},
render: function () {
var filtersGroupContainer;
var self = this;
var keys = Object.keys(this.constantsObject);
//var currentCollection;
var filterKey;
var filterBackend;
var itemView;
this.$el.html(this.template({filterCollection: this.constantsObject}));
filtersGroupContainer = $(this.el).find('#filtersContent');
filtersGroupContainer.html('');
if (keys.length) {
keys.forEach(function (key) {
filterKey = self.constantsObject[key].view;
filterBackend = self.constantsObject[key].backend;
self.currentCollection[filterKey] = new filterValuesCollection(self.filterObject[filterKey]);
//currentCollection = currentCollection.toJSON();
//this.collection[]
itemView = new valuesView({
groupName: key,
currentCollection: self.currentCollection[filterKey],
backendString: filterBackend
})
filtersGroupContainer.append(itemView);
});
}; |
<<<<<<<
INVOICE_PARTIALY_PAID : '55647d952e4aa3804a765eca',
INVOICE_PAID : '55647d982e4aa3804a765ecb',
MOBILE_DEFAULT_COUNT_PER_LIST: 50,
=======
>>>>>>>
INVOICE_PARTIALY_PAID : '55647d952e4aa3804a765eca',
INVOICE_PAID : '55647d982e4aa3804a765ecb',
MOBILE_DEFAULT_COUNT_PER_LIST: 50,
ADMIN_DEPARTMENTS: '56e6775c5ec71b00429745a4',
DASH_VAC_WEEK_BEFORE: 2,
DASH_VAC_WEEK_AFTER : 8,
<<<<<<<
CURRENCY_USD : '565eab29aeb95fa9c0f9df2d',
PROFORMA_JOURNAL: '57035e4321f9b0c4313d4146',
BEFORE_INVOICE : '57035ffd21f9b0c4313d414e',
INVOICE_JOURNAL : '565ef6ba270f53d02ee71d65',
HR_VAC_YEAR_BEFORE: 2,
HR_VAC_YEAR_AFTER : 1,
DEF_LIST_COUNT : 100,
MAX_COUNT : 200,
PARENT_DEV : '56cebdf6541812c07197358f',
SALESDEPARTMENTS : ['55b92ace21e4b7c40f000014', '55bb1f40cb76ca630b000007'],
JOB_FINISHED : '56337c675d49d8d6537832ea',
FINISHED_JOB_JOURNAL: '56ebb636b2a906141f194fa5',
CLOSED_JOB: '56f2a96f58dfeeac4be1582a'
};
=======
HR_VAC_YEAR_AFTER: 1,
DEF_LIST_COUNT : 100,
MAX_COUNT : 200,
PARENT_DEV : '56cebdf6541812c07197358f',
SALESDEPARTMENTS: ['55b92ace21e4b7c40f000014', '55bb1f40cb76ca630b000007']
}
;
>>>>>>>
HR_VAC_YEAR_AFTER: 1,
DEF_LIST_COUNT : 100,
MAX_COUNT : 200,
PARENT_DEV : '56cebdf6541812c07197358f',
SALESDEPARTMENTS: ['55b92ace21e4b7c40f000014', '55bb1f40cb76ca630b000007']
CURRENCY_USD : '565eab29aeb95fa9c0f9df2d',
PROFORMA_JOURNAL: '57035e4321f9b0c4313d4146',
BEFORE_INVOICE : '57035ffd21f9b0c4313d414e',
INVOICE_JOURNAL : '565ef6ba270f53d02ee71d65',
HR_VAC_YEAR_BEFORE: 2,
HR_VAC_YEAR_AFTER : 1,
DEF_LIST_COUNT : 100,
MAX_COUNT : 200,
PARENT_DEV : '56cebdf6541812c07197358f',
SALESDEPARTMENTS : ['55b92ace21e4b7c40f000014', '55bb1f40cb76ca630b000007'],
JOB_FINISHED : '56337c675d49d8d6537832ea',
FINISHED_JOB_JOURNAL: '56ebb636b2a906141f194fa5',
CLOSED_JOB: '56f2a96f58dfeeac4be1582a'
}
; |
<<<<<<<
var journalRouter = require('./journal')(models, event);
=======
var prPositionRouter = require('./projectPosition')(models);
var journalRouter = require('./journal')(models);
>>>>>>>
var prPositionRouter = require('./projectPosition')(models);
var journalRouter = require('./journal')(models, event); |
<<<<<<<
var holidayRouter = require('./holiday')(models);
=======
var opportunityRouter = require('./opportunity')(models);
>>>>>>>
var opportunityRouter = require('./opportunity')(models);
var holidayRouter = require('./holiday')(models);
<<<<<<<
app.use('/holiday', holidayRouter);
=======
app.use('/opportunity', opportunityRouter);
>>>>>>>
app.use('/opportunity', opportunityRouter);
app.use('/holiday', holidayRouter); |
<<<<<<<
'editorCommon:preview': function(event) {
var previewWindow = window.open('loading', 'preview');
=======
'editorCommon:preview': function(isForceRebuild) {
var previewWindow = window.open('/loading', 'preview');
>>>>>>>
'editorCommon:preview': function(isForceRebuild) {
var previewWindow = window.open('loading', 'preview');
<<<<<<<
$.get('api/output/' + Origin.constants.outputPlugin + '/preview/' + this.currentCourseId, _.bind(function(jqXHR, textStatus, errorThrown) {
=======
var url = '/api/output/'+Origin.constants.outputPlugin+'/preview/'+this.currentCourseId+'?force='+(forceRebuild === true);
$.get(url, _.bind(function(jqXHR, textStatus, errorThrown) {
>>>>>>>
var url = 'api/output/'+Origin.constants.outputPlugin+'/preview/'+this.currentCourseId+'?force='+(forceRebuild === true);
$.get(url, _.bind(function(jqXHR, textStatus, errorThrown) {
<<<<<<<
$.get('api/output/' + Origin.constants.outputPlugin + '/publish/' + this.currentCourseId, _.bind(function(jqXHR, textStatus, errorThrown) {
=======
var url = '/api/output/' + Origin.constants.outputPlugin + '/publish/' + this.currentCourseId;
$.get(url, _.bind(function(jqXHR, textStatus, errorThrown) {
>>>>>>>
var url = 'api/output/' + Origin.constants.outputPlugin + '/publish/' + this.currentCourseId;
$.get(url, _.bind(function(jqXHR, textStatus, errorThrown) { |
<<<<<<<
router.get('/getEmployeesCountForDashboard', handler.getEmployeesCountForDashboard);
=======
/**
*@api {get} /employees/EmployeesForChart/ Request EmployeesForChart
*
* @apiVersion 0.0.1
* @apiName getEmployeesForChart
* @apiGroup Employee
*
* @apiSuccess {Object} EmployeesForChart
* @apiSuccessExample Success-Response:
HTTP/1.1 200 OK
[
{
"_id": "Finance",
"employeesCount": 3,
"maleCount": 1,
"femaleCount": 2
},
{
"_id": "Marketing",
"employeesCount": 7,
"maleCount": 2,
"femaleCount": 5
},
...
]
*/
>>>>>>>
router.get('/getEmployeesCountForDashboard', handler.getEmployeesCountForDashboard);
/**
*@api {get} /employees/EmployeesForChart/ Request EmployeesForChart
*
* @apiVersion 0.0.1
* @apiName getEmployeesForChart
* @apiGroup Employee
*
* @apiSuccess {Object} EmployeesForChart
* @apiSuccessExample Success-Response:
HTTP/1.1 200 OK
[
{
"_id": "Finance",
"employeesCount": 3,
"maleCount": 1,
"femaleCount": 2
},
{
"_id": "Marketing",
"employeesCount": 7,
"maleCount": 2,
"femaleCount": 5
},
...
]
*/
<<<<<<<
router.patch('/transfer/', accessStackMiddleware, handler.updateTransfer);
=======
>>>>>>>
router.patch('/transfer/', accessStackMiddleware, handler.updateTransfer);
<<<<<<<
router.delete('/transfer/', accessStackMiddleware, handler.removeTransfer);
=======
/**
*@api {delete} /employees/:id Request for deleting employee
*
* @apiVersion 0.0.1
* @apiName deleteEmployee
* @apiGroup Employee
*
* @apiParam {String} id Unique id of employee
*
* @apiSuccess {Object} deletedEmployee
* @apiSuccessExample Success-Response:
HTTP/1.1 200 OK
{
"success":"Employee removed"
}
* */
>>>>>>>
/**
*@api {delete} /employees/:id Request for deleting employee
*
* @apiVersion 0.0.1
* @apiName deleteEmployee
* @apiGroup Employee
*
* @apiParam {String} id Unique id of employee
*
* @apiSuccess {Object} deletedEmployee
* @apiSuccessExample Success-Response:
HTTP/1.1 200 OK
{
"success":"Employee removed"
}
* */
router.delete('/transfer/', accessStackMiddleware, handler.removeTransfer); |
<<<<<<<
/*function getVac ationFilter(req, res, next) {
if (req.session && req.session.loggedIn && req.session.lastDb) {
access.getReadAccess(req, req.session.uId, 70, function (access) {
if (access) {
var Vacation = models.get(req.session.lastDb, 'Vacation', VacationSchema);
var options = req.query;
var queryObject = {};
var query;
var startDate;
var endDate;
if (options) {
if (options.employee) {
queryObject['employee._id'] = objectId(options.employee);
}
if (options.year && options.year !== 'Line Year') {
if (options.month) {
queryObject.year = options.year;
queryObject.month = options.month;
} else {
endDate = moment([options.year, 12]);
startDate = moment([options.year, 1]);
queryObject.year = {'$in': [options.year, (options.year - 1).toString()]};
}
} else if (options.year) {
var date = new Date();
date = moment([date.getFullYear(), date.getMonth()]);
endDate = new Date(date);
queryObject.endDate = {'$lte': endDate};
date.subtract(12, 'M');
startDate = new Date(date);
date.subtract(12, 'M');
queryObject.startDate = {'$gte': new Date(date)};
}
}
query = Vacation.aggregate(
[
{$match: queryObject},
{
$group: {
_id: {
employee: "$employee",
department: "$department",
month: "$month",
year: "$year"
},
vacationArray: {
$push: {
_idVacation: "$_id",
vacationType: "$vacationType",
startDate: "$startDate",
endDate: "$endDate"
}
}
}
},
{
$project: {
_id: {$concat: ["$_id.month", "$_id.year", "$_id.employee.name"]},
employee: "$_id.employee",
department: "$_id.department",
month: "$_id.month",
year: "$_id.year",
vacationArray: 1
}
}
]
);
*/
/*REMOVE*/
/*
console.dir(queryObject);
query.exec(function (err, result) {
if (err) {
return next(err);
}
if (options.month) {
res.status(200).send(result);
} else {
async.waterfall([
function (callback) {
var resultObj = {
curYear: [],
preYear: []
};
result.forEach(function(element) {
var date = moment([element.year, element.month]);
if (date >= startDate && date <= endDate) {
resultObj['curYear'].push(element);
} else {
resultObj['preYear'].push(element);
}
});
callback(null, resultObj);
},
function (result, callback) {
var stat = calculate(result['preYear'], options.year - 1);
callback(null, result, stat);
}
],
function (err, object, stat) {
if (err) {
return next(err);
}
res.status(200).send({data: object['curYear'], stat: stat});
}
);
}
});
} else {
res.send(403);
}
});
} else {
res.send(401);
}
};*/
=======
>>>>>>> |
<<<<<<<
"backButtonText": "Back to course structure",
"backButtonRoute": "#/editor/" + Origin.location.route1 + "/menu"
=======
backButtonText: Origin.l10n.t('app.backtomenu'),
backButtonRoute: "/#/editor/" + Origin.location.route1 + "/menu"
>>>>>>>
backButtonText: Origin.l10n.t('app.backtomenu'),
backButtonRoute: "#/editor/" + Origin.location.route1 + "/menu"
<<<<<<<
"backButtonText": "Back to courses",
"backButtonRoute": Origin.dashboardRoute || '#/dashboard'
=======
backButtonText: Origin.l10n.t('app.backtoprojects'),
backButtonRoute: Origin.dashboardRoute || '/#/dashboard'
>>>>>>>
backButtonText: Origin.l10n.t('app.backtoprojects'),
backButtonRoute: Origin.dashboardRoute || '#/dashboard' |
<<<<<<<
function (KanbanItemTemplate, common, moment) {
=======
function (Backbone, $, _, KanbanItemTemplate, common) {
'use strict';
>>>>>>>
function (Backbone, $, _, KanbanItemTemplate, common, moment) {
'use strict'; |
<<<<<<<
Employee.aggregate([{
$match: matchObjectForDash
}, {
$lookup: {
from : 'Department',
localField : 'department',
foreignField: '_id',
as : 'department'
}
}, {
$project: {
name : 1,
department: {$arrayElemAt: ['$department', 0]}
}
}, {
$group: {
_id : null,
name: {
$addToSet: {
_id : '$_id',
name: {$concat: ['$name.first', ' ', '$name.last']}
}
},
department: {
$addToSet: {
_id : '$department._id',
name: {
$ifNull: ['$department.departmentName', 'None']
=======
Employee.aggregate([
{
$match: matchObjectForDash
}, {
$lookup: {
from : "Department",
localField : "department",
foreignField: "_id",
as : "department"
}
}, {
$project: {
name : 1,
department: {$arrayElemAt: ['$department', 0]}
}
}, {
$group: {
_id : null,
'name' : {
$addToSet: {
_id : '$_id',
name: {$concat: ['$name.first', ' ', '$name.last']}
}
},
'department': {
$addToSet: {
_id : '$department._id',
name: {'$ifNull': ['$department.name', 'None']}
>>>>>>>
Employee.aggregate([{
$match: matchObjectForDash
}, {
$lookup: {
from : 'Department',
localField : 'department',
foreignField: '_id',
as : 'department'
}
}, {
$project: {
name : 1,
department: {$arrayElemAt: ['$department', 0]}
}
}, {
$group: {
_id : null,
name: {
$addToSet: {
_id : '$_id',
name: {$concat: ['$name.first', ' ', '$name.last']}
}
},
department: {
$addToSet: {
_id : '$department._id',
name: {
$ifNull: ['$department.name', 'None']
<<<<<<<
function getPayRollFiltersValues(callback) {
PayRoll.aggregate([{
$group: {
_id: null,
year: {
$addToSet: {
_id : '$year',
name: '$year'
=======
function getOrdersFiltersValues(callback) {
Quotation.aggregate([
{
$match: {
forSales: false,
isOrder : true
}
}, {
$lookup: {
from : "workflows",
localField : "workflow",
foreignField: "_id", as: "workflow"
}
}, {
$lookup: {
from : "Customer",
localField : "supplier",
foreignField: "_id", as: "supplier"
}
}, {
$project: {
workflow: {$arrayElemAt: ["$workflow", 0]},
supplier: {$arrayElemAt: ["$supplier", 0]}
}
}, {
$group: {
_id : null,
'project' : {
$addToSet: {
_id : '$project._id',
name: '$project.name'
}
},
'supplier' : {
$addToSet: {
_id : '$supplier._id',
name: {
$concat: ['$supplier.name.first', ' ', '$supplier.name.last']
}
}
},
'projectmanager': {
$addToSet: {
_id : '$project.projectmanager._id',
name: '$project.projectmanager.name'
}
},
'workflow' : {
$addToSet: {
_id : '$workflow._id',
name: '$workflow.name'
}
>>>>>>>
function getPayRollFiltersValues(callback) {
PayRoll.aggregate([{
$group: {
_id: null,
year: {
$addToSet: {
_id : '$year',
name: '$year' |
<<<<<<<
var JournalEntryHandler = require('./journalEntry');
var journalEntry = new JournalEntryHandler(models);
//
//exportDecorator.addExportFunctionsToHandler(this, function (req) {
// return models.get(req.session.lastDb, 'wTrack', wTrackSchema);
//}, exportMap, "wTrack");
=======
exportDecorator.addExportFunctionsToHandler(this, function (req) {
return models.get(req.session.lastDb, 'wTrack', wTrackSchema);
}, exportMap, 'wTrack');
>>>>>>>
var JournalEntryHandler = require('./journalEntry');
var journalEntry = new JournalEntryHandler(models);
exportDecorator.addExportFunctionsToHandler(this, function (req) {
return models.get(req.session.lastDb, 'wTrack', wTrackSchema);
}, exportMap, 'wTrack');
//
//exportDecorator.addExportFunctionsToHandler(this, function (req) {
// return models.get(req.session.lastDb, 'wTrack', wTrackSchema);
//}, exportMap, "wTrack");
<<<<<<<
var stDate = moment().year(wTrack.year).isoWeek(wTrack.week).day(1);
//journalEntry.setReconcileDate(req, stDate);
event.emit('setReconcileTimeCard', {req: req, week: wTrack.week, year: wTrack.year});
event.emit('updateRevenue', {wTrack: wTrack, req: req});
event.emit('recalculateKeys', {req: req, wTrack: wTrack});
event.emit('dropHoursCashes', req);
event.emit('recollectVacationDash');
event.emit('updateProjectDetails', {req: req, _id: wTrack.project});
event.emit('recollectProjectInfo');
=======
event.emit('updateRevenue', {wTrack: _wTrack, req: req});
event.emit('recalculateKeys', {req: req, wTrack: _wTrack});
event.emit('dropHoursCashes', req);
event.emit('recollectVacationDash');
event.emit('updateProjectDetails', {req: req, _id: _wTrack.project});
event.emit('recollectProjectInfo');
>>>>>>>
event.emit('setReconcileTimeCard', {req: req, week: wTrack.week, year: wTrack.year});
event.emit('updateRevenue', {wTrack: _wTrack, req: req});
event.emit('recalculateKeys', {req: req, wTrack: _wTrack});
event.emit('dropHoursCashes', req);
event.emit('recollectVacationDash');
event.emit('updateProjectDetails', {req: req, _id: _wTrack.project});
event.emit('recollectProjectInfo');
<<<<<<<
event.emit('updateRevenue', {wTrack: wTrack, req: req});
event.emit('setReconcileTimeCard', {req: req, week: wTrack.week, year: wTrack.year});
=======
event.emit('updateRevenue', {wTrack: tCard, req: req});
>>>>>>>
event.emit('setReconcileTimeCard', {req: req, week: wTrack.week, year: wTrack.year});
event.emit('updateRevenue', {wTrack: tCard, req: req});
<<<<<<<
journalEntry.setReconcileDate(req, stDate);
for (var j = 7; j >= 1; j--) {
=======
for (j = 7; j >= 1; j--) {
>>>>>>>
journalEntry.setReconcileDate(req, stDate);
for (j = 7; j >= 1; j--) { |
<<<<<<<
'text!templates/salesOrder/EditTemplate.html',
'text!templates/salesOrder/ViewTemplate.html',
=======
'Backbone',
'jQuery',
'Underscore',
"text!templates/salesOrder/EditTemplate.html",
"text!templates/salesOrder/ViewTemplate.html",
>>>>>>>
'Backbone',
'jQuery',
'Underscore',
'text!templates/salesOrder/EditTemplate.html',
'text!templates/salesOrder/ViewTemplate.html',
<<<<<<<
//populate.get("#currencyDd", "/currency/getForDd", {}, 'name', this/*, true, true*/);
=======
populate.get("#currencyDd", CONSTANTS.URLS.CURRENCY_FORDD, {}, 'name', this/*, true, true*/);
>>>>>>>
//populate.get("#currencyDd", CONSTANTS.URLS.CURRENCY_FORDD, {}, 'name', this/*, true, true*/); |
<<<<<<<
'custom',
'constants'
=======
'custom',
'constants'
>>>>>>>
"populate",
'custom',
'constants'
<<<<<<<
function (CreateTemplate, ProjectModel, populate, attachView, AssigneesView, BonusView, selectView, customFile, constants) {
=======
function (Backbone, $, _, CreateTemplate, ProjectModel, populate, attachView, AssigneesView, BonusView, selectView, customFile, CONSTANTS) {
>>>>>>>
function (Backbone, $, _, CreateTemplate, ProjectModel, AttachView, AssigneesView, BonusView, SelectView, populate, customFile) {
<<<<<<<
nextSelect: function (e) {
=======
/*nextSelect : function (e) {
>>>>>>>
nextSelect: function (e) {
<<<<<<<
populate.get("#projectTypeDD", "/projectType", {}, "name", this, true, true);
populate.get("#paymentTerms", "/paymentTerm", {}, 'name', this, true, true, constants.PAYMENT_TERMS);
populate.get("#paymentMethod", "/paymentMethod", {}, 'name', this, true, true, constants.PAYMENT_METHOD);
populate.get2name("#customerDd", "/Customer", {}, this, true, true);
populate.getWorkflow("#workflowsDd", "#workflowNamesDd", "/WorkflowsForDd", {id: "Projects"}, "name", this, true);
=======
populate.get("#projectTypeDD", CONSTANTS.URLS.PROJECT_TYPE, {}, "name", this, true, true);
populate.get2name("#projectManagerDD", CONSTANTS.URLS.EMPLOYEES_PERSONSFORDD, {}, this, true);
populate.get2name("#customerDd", CONSTANTS.URLS.CUSTOMERS, {}, this, true, true);
populate.getWorkflow("#workflowsDd", "#workflowNamesDd", CONSTANTS.URLS.WORKFLOWS_FORDD, {id: "Projects"}, "name", this, true);
>>>>>>>
populate.get("#projectTypeDD", CONSTANTS.URLS.PROJECT_TYPE, {}, "name", this, true, true);
populate.get("#paymentTerms", "/paymentTerm", {}, 'name', this, true, true, constants.PAYMENT_TERMS);
populate.get("#paymentMethod", "/paymentMethod", {}, 'name', this, true, true, constants.PAYMENT_METHOD);
populate.get2name("#customerDd", CONSTANTS.URLS.CUSTOMERS, {}, this, true, true);
populate.getWorkflow("#workflowsDd", "#workflowNamesDd", CONSTANTS.URLS.WORKFLOWS_FORDD, {id: "Projects"}, "name", this, true); |
<<<<<<<
'text!templates/monthHours/list/cancelEdit.html',
'helpers'
], function (listViewBase, listTemplate, createView, listItemView, editView, currentModel, contentCollection, EditCollection, common, dataService, populate, async, CONSTANTS, cancelEdit, helpers) {
=======
'text!templates/monthHours/list/cancelEdit.html'
], function (Backbone, $, _, listViewBase, listTemplate, createView, listItemView, editView, currentModel, contentCollection, EditCollection, common, dataService, populate, async, CONSTANTS, cancelEdit) {
>>>>>>>
'text!templates/monthHours/list/cancelEdit.html',
'helpers'
], function (Backbone, $, _, listViewBase, listTemplate, createView, listItemView, editView, currentModel, contentCollection, EditCollection, common, dataService, populate, async, CONSTANTS, cancelEdit, helpers) { |
<<<<<<<
"common",
"populate",
"custom",
'constants'
], function (Backbone, $, _, EditTemplate, selectView, attachView, AssigneesView, common, populate, custom, CONSTANTS) {
=======
'common',
'populate',
'custom',
'constants'
], function (Backbone, $, _, EditTemplate, SelectView, AttachView, AssigneesView, common, populate, custom, CONSTANTS) {
>>>>>>>
'common',
'populate',
'custom',
'constants'
], function (Backbone, $, _, EditTemplate, SelectView, AttachView, AssigneesView, common, populate, custom, CONSTANTS) {
<<<<<<<
populate.get("#departmentsDd", "/DepartmentsForDd", {}, "departmentName", this);
populate.get("#jobPositionDd", "/JobPositionForDd", {}, "name", this);
populate.get("#jobTypeDd", "/jobType", {}, "_id", this);
populate.get("#nationality", "/nationality", {}, "_id", this);
populate.get2name("#projectManagerDD", "/getPersonsForDd", {}, this);
populate.get("#relatedUsersDd", CONSTANTS.URLS.USERS_FOR_DD, {}, "login", this, false, true);
=======
populate.get("#departmentsDd", "/departments/getForDD", {}, "departmentName", this);
populate.get("#jobPositionDd", "/jobPositions/getForDd", {}, "name", this);
populate.get("#jobTypeDd", "/jobPositions/jobType", {}, "_id", this);
populate.get("#nationality", "/employees/nationality", {}, "_id", this);
populate.get2name("#projectManagerDD", "/employees/getPersonsForDd", {}, this);
populate.get("#relatedUsersDd", "/UsersForDd", {}, "login", this, false, true);
>>>>>>>
populate.get("#departmentsDd", "/departments/getForDD", {}, "departmentName", this);
populate.get("#jobPositionDd", "/jobPositions/getForDd", {}, "name", this);
populate.get("#jobTypeDd", "/jobPositions/jobType", {}, "_id", this);
populate.get("#nationality", "/employees/nationality", {}, "_id", this);
populate.get2name("#projectManagerDD", "/employees/getPersonsForDd", {}, this);
populate.get("#relatedUsersDd", CONSTANTS.URLS.USERS_FOR_DD, {}, "login", this, false, true); |
<<<<<<<
var JournalEntryHandler = require('./journalEntry');
var _journalEntryHandler = new JournalEntryHandler(models);
function checkDb(db) {
var validDbs = ["weTrack", "production", "development"];
return validDbs.indexOf(db) !== -1;
}
=======
>>>>>>>
var JournalEntryHandler = require('./journalEntry');
var _journalEntryHandler = new JournalEntryHandler(models);
function checkDb(db) {
var validDbs = ["weTrack", "production", "development"];
return validDbs.indexOf(db) !== -1;
}
<<<<<<<
if (isForSale) { //todo added in case of no last task
=======
if (isForSale) { //todo added in case of no last task
>>>>>>>
if (isForSale) { //todo added in case of no last task
<<<<<<<
if (isForSale && ((DbName === MAIN_CONSTANTS.WTRACK_DB_NAME) || (DbName === "production") || (DbName === "development"))) { // todo added condition for purchase payment
=======
if (isForSale) { // todo added condition for purchase payment
>>>>>>>
if (isForSale) { // todo added condition for purchase payment
<<<<<<<
supplier : {$arrayElemAt: ["$supplier", 0]},
invoice : {$arrayElemAt: ["$invoice", 0]},
paymentMethod: {$arrayElemAt: ["$paymentMethod", 0]},
forSale : 1,
isExpense : 1,
bonus : 1
=======
supplier : {$arrayElemAt: ["$supplier", 0]},
invoice : {$arrayElemAt: ["$invoice", 0]},
paymentMethod : {$arrayElemAt: ["$paymentMethod", 0]},
forSale : 1,
differenceAmount: 1,
paidAmount : 1,
workflow : 1,
date : 1,
isExpense : 1,
bonus : 1,
paymentRef : 1,
year : 1,
month : 1,
period : 1
>>>>>>>
supplier : {$arrayElemAt: ["$supplier", 0]},
invoice : {$arrayElemAt: ["$invoice", 0]},
paymentMethod : {$arrayElemAt: ["$paymentMethod", 0]},
forSale : 1,
differenceAmount: 1,
paidAmount : 1,
workflow : 1,
date : 1,
isExpense : 1,
bonus : 1,
paymentRef : 1,
year : 1,
month : 1,
period : 1
<<<<<<<
supplier : 1,
assigned : {$arrayElemAt: ["$assigned", 0]},
paymentMethod: 1,
invoice : 1,
forSale : 1,
isExpense : 1,
bonus : 1
=======
supplier : 1,
invoice : 1,
assigned : {$arrayElemAt: ["$assigned", 0]},
forSale : 1,
differenceAmount: 1,
paidAmount : 1,
workflow : 1,
date : 1,
paymentMethod : 1,
isExpense : 1,
bonus : 1,
paymentRef : 1,
year : 1,
month : 1,
period : 1
>>>>>>>
supplier : 1,
invoice : 1,
assigned : {$arrayElemAt: ["$assigned", 0]},
forSale : 1,
differenceAmount: 1,
paidAmount : 1,
workflow : 1,
date : 1,
paymentMethod : 1,
isExpense : 1,
bonus : 1,
paymentRef : 1,
year : 1,
month : 1,
period : 1 |
<<<<<<<
app.use('/payroll', payRollRouter);
=======
app.use('/jobs', jobsRouter);
>>>>>>>
app.use('/payroll', payRollRouter);
app.use('/jobs', jobsRouter); |
<<<<<<<
"mouseover .search-content" : 'showSearchContent',
"click .search-content" : 'showSearchContent',
=======
"mouseover .search-content" : 'showSearchContent',
"click .search-content" : 'showSearchContent',
>>>>>>>
"mouseover .search-content" : 'showSearchContent',
"click .search-content" : 'showSearchContent',
<<<<<<<
this.renderFilterContent(options);
this.showFilterIcons(App.filter);
=======
this.renderFilterContent();
this.showFilterIcons(filters);
>>>>>>>
this.renderFilterContent(options);
this.showFilterIcons(filters); |
<<<<<<<
this.salesManager = options.salesManager;
this.filter = options.filter ? options.filter : {};
=======
this.projectManager = options.projectManager;
this.filter = options.filter || {};
>>>>>>>
this.salesManager = options.salesManager;
this.filter = options.filter || {};
<<<<<<<
this.page = options.page ? options.page : 1;
this.eventChannel = options.eventChannel;
=======
this.page = options.page || 1;
>>>>>>>
this.page = options.page || 1;
this.eventChannel = options.eventChannel;
<<<<<<<
quotations : this.collection.toJSON(),
startNumber : 0,
dateToLocal : common.utcDateToLocaleDate,
currencySplitter: helpers.currencySplitter,
currencyClass: helpers.currencyClass
=======
quotations : this.collection.toJSON(),
startNumber : 0,
dateToLocal : common.utcDateToLocaleDate,
currencySplitter: helpers.currencySplitter
>>>>>>>
quotations : this.collection.toJSON(),
startNumber : 0,
dateToLocal : common.utcDateToLocaleDate,
currencySplitter: helpers.currencySplitter,
currencyClass: helpers.currencyClass
<<<<<<<
App.startPreload();
=======
self.collection.bind('remove', renderProformRevenue);
>>>>>>>
App.startPreload();
<<<<<<<
that.eventChannel && that.eventChannel.trigger('elemCountChanged');
//that.deleteItemsRender(that.deleteCounter, that.deletePage);
=======
>>>>>>>
that.eventChannel && that.eventChannel.trigger('elemCountChanged');
//that.deleteItemsRender(that.deleteCounter, that.deletePage);
<<<<<<<
checked: function (e) {
e.stopPropagation();
=======
checked: function () {
var el = this.$el;
>>>>>>>
checked: function (e) {
e.stopPropagation(); |
<<<<<<<
}
=======
},
gotoForm: function (e) {
var id = $(e.target).closest('tr').data('id');
var page = this.collection.currentPage;
var countPerPage = this.collection.pageSize;
var url = this.formUrl + id + '/p=' + page + '/c=' + countPerPage;
if (this.filter) {
url += '/filter=' + encodeURI(JSON.stringify(this.filter));
}
App.ownContentType = true;
Backbone.history.navigate(url, {trigger: true});
}
/*gotoForm: function (e) {
var id = $(e.target).closest('tr').data('id');
var model = new CurrentModel({validate: false});
var url = this.formUrl + id + '/p=' + page + '/c=' + countPerPage;
e.preventDefault();
model.urlRoot = '/Opportunities';
model.fetch({
data: {
id : id,
viewType: 'form'
},
success: function (model) {
return new EditView({model: model});
},
error: function () {
App.render({
type : 'error',
message: 'Please refresh browser'
});
}
});
}*/
>>>>>>>
},
gotoForm: function (e) {
var id = $(e.target).closest('tr').data('id');
var page = this.collection.currentPage;
var countPerPage = this.collection.pageSize;
var url = this.formUrl + id + '/p=' + page + '/c=' + countPerPage;
if (this.filter) {
url += '/filter=' + encodeURI(JSON.stringify(this.filter));
}
App.ownContentType = true;
Backbone.history.navigate(url, {trigger: true});
} |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.